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

Reject close of active vote accounts (backport #22651)#22896

Merged
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22651
Feb 3, 2022
Merged

Reject close of active vote accounts (backport #22651)#22896
mergify[bot] merged 2 commits intov1.9from
mergify/bp/v1.9/pr-22651

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Feb 2, 2022

This is an automatic backport of pull request #22651 done by Mergify.
Cherry-pick of 75563f6 has failed:

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

You are currently cherry-picking commit 75563f6c7.
  (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:   programs/vote/src/vote_state/mod.rs
	modified:   runtime/src/bank.rs
	modified:   sdk/program/src/instruction.rs
	modified:   sdk/program/src/program_error.rs
	modified:   storage-proto/proto/transaction_by_addr.proto
	modified:   storage-proto/src/convert.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   programs/vote/src/vote_processor.rs
	both modified:   sdk/src/feature_set.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.com

* 10461 Reject close of vote accounts unless it earned no credits in the previous epoch. This is checked by comparing current epoch (from clock sysvar) with the most recent epoch with credits in vote state.

(cherry picked from commit 75563f6)

# Conflicts:
#	programs/vote/src/vote_processor.rs
#	sdk/src/feature_set.rs
@mergify mergify Bot added the conflicts label Feb 2, 2022
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 3, 2022
@mergify mergify Bot merged commit 643442e into v1.9 Feb 3, 2022
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-22651 branch February 3, 2022 19:59
@github-actions
Copy link
Copy Markdown
Contributor

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Mar 30, 2022
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 locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant