Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Refactor: move sysvar cache to new module (backport #22448)#22460

Closed
mergify[bot] wants to merge 1 commit intov1.8from
mergify/bp/v1.8/pr-22448
Closed

Refactor: move sysvar cache to new module (backport #22448)#22460
mergify[bot] wants to merge 1 commit intov1.8from
mergify/bp/v1.8/pr-22448

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 12, 2022

This is an automatic backport of pull request #22448 done by Mergify.
Cherry-pick of 7171c95 has failed:

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

You are currently cherry-picking commit 7171c95bd.
  (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:
	new file:   program-runtime/src/sysvar_cache.rs
	new file:   runtime/src/bank/sysvar_cache.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Cargo.lock
	deleted by us:   program-runtime/Cargo.toml
	both modified:   program-runtime/src/invoke_context.rs
	deleted by us:   program-runtime/src/lib.rs
	both modified:   programs/bpf/Cargo.lock
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   programs/stake/src/stake_instruction.rs
	both modified:   programs/vote/src/vote_instruction.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/message_processor.rs

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

(cherry picked from commit 7171c95)

# Conflicts:
#	Cargo.lock
#	program-runtime/Cargo.toml
#	program-runtime/src/invoke_context.rs
#	program-runtime/src/lib.rs
#	programs/bpf/Cargo.lock
#	programs/bpf_loader/src/syscalls.rs
#	programs/stake/src/stake_instruction.rs
#	programs/vote/src/vote_instruction.rs
#	runtime/src/bank.rs
#	runtime/src/message_processor.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jan 12, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 12, 2022

automerge label removed due to a CI failure

@jstarry jstarry self-assigned this Jan 12, 2022
@jstarry
Copy link
Copy Markdown
Contributor

jstarry commented Jan 13, 2022

Waiting on #22466

@jstarry
Copy link
Copy Markdown
Contributor

jstarry commented Jan 14, 2022

Only back porting to v1.9

@jstarry jstarry closed this Jan 14, 2022
@mergify mergify Bot deleted the mergify/bp/v1.8/pr-22448 branch January 14, 2022 06:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant