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)#22895

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

Reject close of active vote accounts (backport #22651)#22895
mergify[bot] merged 9 commits intov1.8from
mergify/bp/v1.8/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.8/pr-22651
Your branch is up to date with 'origin/v1.8'.

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:   sdk/src/feature_set.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   programs/vote/src/vote_processor.rs
	both modified:   programs/vote/src/vote_state/mod.rs
	both modified:   runtime/src/bank.rs
	both modified:   sdk/program/src/instruction.rs
	both modified:   sdk/program/src/program_error.rs
	both modified:   storage-proto/proto/transaction_by_addr.proto
	both modified:   storage-proto/src/convert.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
#	programs/vote/src/vote_state/mod.rs
#	runtime/src/bank.rs
#	sdk/program/src/instruction.rs
#	sdk/program/src/program_error.rs
#	storage-proto/proto/transaction_by_addr.proto
#	storage-proto/src/convert.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 2, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 2, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 3, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 3, 2022

automerge label removed due to a CI failure

None
};
vote_state::withdraw(me, lamports, to, &signers, rent_sysvar.as_deref())
let clock_if_feature_active = if invoke_context.is_feature_active(
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aha. I was wondering why you had to redo this change, but I see the refactor to programs/vote/src/vote_processor.rs doesn't exist on v1.8. Can you also remove that dangling file here?

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 3, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 3, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 3, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 3, 2022

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Feb 3, 2022
@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 4, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 4, 2022

automerge label removed due to a CI failure


/// Accounts data budget exceeded
#[error("Requested account data allocation exceeded the accounts data budget")]
AccountsDataBudgetExceeded,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Welcome to the v1.8 branch! 😅

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 4, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 4, 2022

Codecov Report

Merging #22895 (7897a35) into v1.8 (add26be) will increase coverage by 0.0%.
The diff coverage is 96.8%.

@@           Coverage Diff            @@
##             v1.8   #22895    +/-   ##
========================================
  Coverage    81.6%    81.7%            
========================================
  Files         464      464            
  Lines      131709   132168   +459     
========================================
+ Hits       107555   108034   +479     
+ Misses      24154    24134    -20     

@solana-grimes
Copy link
Copy Markdown
Contributor

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

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 4, 2022
@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 4, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 4, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Feb 4, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 4, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Feb 4, 2022
@mergify mergify Bot merged commit 4ce59bb into v1.8 Feb 7, 2022
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-22651 branch February 7, 2022 16:18
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Feb 7, 2022

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Feb 7, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants