Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restricts rent-paying accounts lifetime extension (backport #26606) #26635

Merged
merged 2 commits into from
Jul 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 15, 2022

This is an automatic backport of pull request #26606 done by Mergify.
Cherry-pick of bf225ba has failed:

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

You are currently cherry-picking commit bf225bae7.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

#22292
prevents rent paying accounts creation going forward. However a rent
paying account can linger on for ever if it is continually topped up but
stays below the rent-exempt minimum.
This can prevent eliminating accounts-rewrites and the problematic
rent_epoch field in accounts.

Link to discord discussion:
https://discord.com/channels/428295358100013066/943609352068145162/995202300001927219

This commit restricts rent-paying accounts lifetime extension by
preventing increasing lamports on the account if the account stays below
the rent-exempt minimum.

(cherry picked from commit bf225ba)

# Conflicts:
#	runtime/src/account_rent_state.rs
#	runtime/src/accounts.rs
#	runtime/src/bank/transaction_account_state_info.rs
#	sdk/src/feature_set.rs
@mergify mergify bot added conflicts feature-gate Pull Request adds or modifies a runtime feature gate labels Jul 15, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 15, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jul 15, 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 Jul 15, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jul 15, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jul 15, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jul 15, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jul 15, 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 Jul 15, 2022
@mergify mergify bot merged commit 1580072 into v1.10 Jul 15, 2022
@mergify mergify bot deleted the mergify/bp/v1.10/pr-26606 branch July 15, 2022 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts feature-gate Pull Request adds or modifies a runtime feature gate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant