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

Manage durable nonce stored value in runtime (bp #7684) #7760

Merged
merged 1 commit into from
Jan 11, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 10, 2020

This is an automated backport of pull request #7684 done by Mergify.io

Cherry-pick of 9754fc7 has failed:

On branch mergify/bp/v0.22/pr-7684
Your branch is up to date with 'origin/v0.22'.

You are currently cherry-picking commit 9754fc789.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   core/src/transaction_status_service.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/nonce_utils.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   runtime/src/accounts.rs

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options
More conditions and actions can be found in the [documention](https://doc.mergify.io/).

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
  • @Mergifyio backports <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 simulator.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 10, 2020
@t-nelson
Copy link
Contributor

This is what merging at 5pm on Friday gets me...

* Bank: Return nonce pubkey/account from `check_tx_durable_nonce`

* Forward account with HashAgeKind::DurableNonce

* Add durable nonce helper for HashAgeKind

* Add nonce util for advancing stored nonce in runtime

* Advance nonce in runtime

* Store rolled back nonce account on TX InstructionError

* nonce: Add test for replayed InstErr fee theft
@solana-grimes
Copy link
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 Jan 11, 2020
@t-nelson t-nelson added the automerge Merge this Pull Request automatically once CI passes label Jan 11, 2020
@codecov
Copy link

codecov bot commented Jan 11, 2020

Codecov Report

Merging #7760 into v0.22 will increase coverage by 14.3%.
The diff coverage is 82.9%.

@@           Coverage Diff            @@
##           v0.22   #7760      +/-   ##
========================================
+ Coverage   67.4%   81.8%   +14.3%     
========================================
  Files        242     238       -4     
  Lines      61035   50876   -10159     
========================================
+ Hits       41188   41626     +438     
+ Misses     19847    9250   -10597

@solana-grimes solana-grimes merged commit a92855c into v0.22 Jan 11, 2020
@mergify mergify bot deleted the mergify/bp/v0.22/pr-7684 branch January 11, 2020 01:12
sakridge pushed a commit to sakridge/solana that referenced this pull request Jan 14, 2020
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants