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

Move nonce into system program (bp #7645) #7671

Merged
merged 2 commits into from
Jan 4, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 4, 2020

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

Cherry-pick of 7e94cc2 has failed:

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

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

Changes to be committed:

	modified:   cli/src/cli.rs
	modified:   genesis-programs/src/lib.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/genesis_utils.rs
	modified:   runtime/src/message_processor.rs
	modified:   runtime/src/nonce_utils.rs
	modified:   sdk/src/genesis_config.rs
	modified:   sdk/src/lib.rs
	deleted:    sdk/src/nonce_instruction.rs
	deleted:    sdk/src/nonce_program.rs
	modified:   sdk/src/nonce_state.rs
	modified:   sdk/src/system_instruction.rs
	modified:   sdk/src/transaction.rs

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

	both modified:   cli/src/nonce.rs
	both modified:   runtime/src/accounts.rs
	both modified:   runtime/src/system_instruction_processor.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 4, 2020
@mvines
Copy link
Member

mvines commented Jan 4, 2020

😬, @t-nelson 🚑

@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2020
@t-nelson
Copy link
Contributor

t-nelson commented Jan 4, 2020

Needs #7672 ... 👉 👈

@codecov
Copy link

codecov bot commented Jan 4, 2020

Codecov Report

Merging #7671 into v0.22 will decrease coverage by 12.2%.
The diff coverage is 79.6%.

@@           Coverage Diff            @@
##           v0.22   #7671      +/-   ##
========================================
- Coverage   80.8%   68.5%   -12.3%     
========================================
  Files        244     243       -1     
  Lines      50567   59893    +9326     
========================================
+ Hits       40872   41046     +174     
- Misses      9695   18847    +9152

@t-nelson t-nelson force-pushed the mergify/bp/v0.22/pr-7645 branch from 4f9b6ef to b02000a Compare January 4, 2020 01:34
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2020
@solana-grimes
Copy link
Contributor

💔 Unable to automerge due to CI failure

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2020
@solana-grimes solana-grimes merged commit cee2226 into v0.22 Jan 4, 2020
@mergify mergify bot deleted the mergify/bp/v0.22/pr-7645 branch January 4, 2020 02:34
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.

3 participants