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

stake: Advance credits_observed on activation epoch (backport #19309)#19626

Merged
mergify[bot] merged 2 commits intov1.7from
mergify/bp/v1.7/pr-19309
Sep 4, 2021
Merged

stake: Advance credits_observed on activation epoch (backport #19309)#19626
mergify[bot] merged 2 commits intov1.7from
mergify/bp/v1.7/pr-19309

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Sep 3, 2021

This is an automatic backport of pull request #19309 done by Mergify.
Cherry-pick of 2c3bded has failed:

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

You are currently cherry-picking commit 2c3bdedea.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   program-test/tests/warp.rs
	modified:   programs/stake/src/stake_state.rs
	modified:   sdk/src/feature_set.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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 config editor.

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

* stake: Advance `credits_observed` on activation epoch

* Add test for merging stakes just after activation

(cherry picked from commit 2c3bded)

# Conflicts:
#	runtime/src/bank.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Sep 3, 2021
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Sep 3, 2021
@solana-grimes
Copy link
Copy Markdown
Contributor

😱 New commits were pushed while the automerge label was present.

@joncinque joncinque added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Sep 3, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Sep 4, 2021

Codecov Report

Merging #19626 (36d15fd) into v1.7 (105a891) will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##             v1.7   #19626   +/-   ##
=======================================
  Coverage    82.2%    82.2%           
=======================================
  Files         437      437           
  Lines      123934   123953   +19     
=======================================
+ Hits       101926   101968   +42     
+ Misses      22008    21985   -23     

@mergify mergify Bot merged commit c180f4c into v1.7 Sep 4, 2021
@mergify mergify Bot deleted the mergify/bp/v1.7/pr-19309 branch September 4, 2021 01:29
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants