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

adds system instruction to upgrade legacy nonce versions (backport #25789) #25891

Merged
merged 3 commits into from
Jun 10, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 10, 2022

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

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

You are currently cherry-picking commit b4190319a.
  (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:   cli/src/cli.rs
	modified:   cli/src/nonce.rs
	modified:   docs/src/developing/clients/javascript-api.md
	modified:   runtime/src/system_instruction_processor.rs
	modified:   sdk/program/src/nonce/state/mod.rs
	modified:   transaction-status/src/parse_system.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/program/src/system_instruction.rs
	both modified:   web3.js/src/system-program.ts

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

…#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:
#	sdk/program/src/system_instruction.rs
#	web3.js/src/system-program.ts
@mergify mergify bot added the conflicts label Jun 10, 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 Jun 10, 2022
@mergify
Copy link
Contributor Author

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

mergify bot commented Jun 10, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 10, 2022
@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jun 10, 2022
@solana-grimes
Copy link
Contributor

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

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 10, 2022
@codecov
Copy link

codecov bot commented Jun 10, 2022

Codecov Report

Merging #25891 (8f535f7) into v1.10 (5894573) will decrease coverage by 0.0%.
The diff coverage is 90.7%.

@@            Coverage Diff            @@
##            v1.10   #25891     +/-   ##
=========================================
- Coverage    81.5%    81.5%   -0.1%     
=========================================
  Files         597      597             
  Lines      163152   163658    +506     
=========================================
+ Hits       132998   133409    +411     
- Misses      30154    30249     +95     

@behzadnouri behzadnouri merged commit 2cbad31 into v1.10 Jun 10, 2022
@behzadnouri behzadnouri deleted the mergify/bp/v1.10/pr-25789 branch June 10, 2022 17:07
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants