Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

fix rewards points (bp #10914)#11142

Merged
mergify[bot] merged 2 commits intov1.2from
mergify/bp/v1.2/pr-10914
Jul 21, 2020
Merged

fix rewards points (bp #10914)#11142
mergify[bot] merged 2 commits intov1.2from
mergify/bp/v1.2/pr-10914

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jul 21, 2020

This is an automated backport of pull request #10914 done by Mergify

Cherry-pick of 7cc2a68 has failed:

On branch mergify/bp/v1.2/pr-10914
Your branch is up to date with 'origin/v1.2'.

You are currently cherry-picking commit 7cc2a6801.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   programs/stake/src/stake_state.rs
	modified:   programs/vote/src/vote_state/mod.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/stakes.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   runtime/src/serde_snapshot/tests.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

* fix rewards points

* fixups

* * verify that we don't spend more in rewards than we've allocated for rewards
* purge f64s from calculations that could be done with integers

* test typical values

* simplify iteration over delegations some

* fixups

* Use try_from

* Add a comment for commission_split()

* Add assertion to detect inconsistent reward dist.

* Fix vote_balance_and_staked

* Don't overwrite accounts with stale copies

* Fix CI...

* Add tests for vote_balance_and_staked

* Add test for the determinism of update_rewards

* Revert "Don't overwrite accounts with stale copies"

This reverts commit 9886d08.

* Make stake_delegation_accounts to return hashmap

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
(cherry picked from commit 7cc2a68)

# Conflicts:
#	runtime/src/serde_snapshot/tests.rs
@mergify mergify Bot added the conflicts label Jul 21, 2020
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jul 21, 2020
@mergify mergify Bot merged commit e07c007 into v1.2 Jul 21, 2020
@mergify mergify Bot deleted the mergify/bp/v1.2/pr-10914 branch July 21, 2020 06:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants