This repository has been archived by the owner on Jan 13, 2025. It is now read-only.
adds system instruction to upgrade legacy nonce versions (backport #25789) #25890
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
…#25789) #25788 permanently disables durable transactions with legacy nonce versions which are within chain blockhash domain. This commit adds a new system instruction for a one-time idempotent upgrade of legacy nonce accounts in order to bump them out of chain blockhash domain. (cherry picked from commit b419031) # Conflicts: # runtime/src/system_instruction_processor.rs # sdk/program/src/system_instruction.rs # web3.js/src/system-program.ts
mergify
bot
added
automerge
|
automerge label removed due to a CI failure |
behzadnouri
force-pushed
the
mergify/bp/v1.9/pr-25789
branch
from
6f50a58 to
908488f
Compare
mergify
bot
added
automerge
|
automerge label removed due to a CI failure |
mergify
bot
added
the
automerge
|
automerge label removed due to a CI failure |
mergify
bot
removed
the
automerge
behzadnouri
force-pushed
the
mergify/bp/v1.9/pr-25789
branch
from
af426df to
d72a228
Compare
mergify
bot
added
automerge
|
automerge label removed due to a CI failure |
behzadnouri
force-pushed
the
mergify/bp/v1.9/pr-25789
branch
from
d72a228 to
79d0e39
Compare
mergify
bot
added
the
automerge
|
automerge label removed due to a CI failure |
mergify
bot
added
automerge
behzadnouri
reviewed
Jun 10, 2022
Comment on lines
+423
to
+442
| SystemInstruction::UpgradeNonceAccount => { | ||
| let separate_nonce_from_blockhash = invoke_context | ||
| .feature_set | ||
| .is_active(&feature_set::separate_nonce_from_blockhash::id()); | ||
| if !separate_nonce_from_blockhash { | ||
| return Err(InstructionError::InvalidInstructionData); | ||
| } | ||
| let nonce_account = keyed_account_at_index(keyed_accounts, first_instruction_account)?; | ||
| if !system_program::check_id(&nonce_account.owner()?) { | ||
| return Err(InstructionError::InvalidAccountOwner); | ||
| } | ||
| if !nonce_account.is_writable() { | ||
| return Err(InstructionError::InvalidArgument); | ||
| } | ||
| let nonce_versions: nonce::state::Versions = nonce_account.state()?; | ||
| match nonce_versions.upgrade() { | ||
| None => Err(InstructionError::InvalidArgument), | ||
| Some(nonce_versions) => nonce_account.set_state(&nonce_versions), | ||
| } | ||
| } |
There was a problem hiding this comment.
@Lichtso @jackcmay Backporting #25789 to v1.9 was not straightforward given the KeyedAccount changes.
Would you please double check if this code is precisely equivalent to master:
https://github.com/solana-labs/solana/blob/98176fad7/runtime/src/system_instruction_processor.rs#L486-L507
e.g. that failure conditions and resulting kinds of error has not changed.
There was a problem hiding this comment.
There is only one instruction account so at least there can be no borrow collision by account aliasing. The only tricky part here is the index of keyed_account_at_index(keyed_accounts, first_instruction_account)?
vs instruction_context.try_borrow_instruction_account(transaction_context, 0)? and that is correct.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an automatic backport of pull request #25789 done by Mergify.
Cherry-pick of b419031 has failed:
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 refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com