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

Switch programs activation to whole-set based gating (bp #11750) #11837

Merged
merged 2 commits into from
Aug 25, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2020

This is an automated backport of pull request #11750 done by Mergify

Cherry-pick of db4bbb3 has failed:

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

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

Changes to be committed:

	modified:   genesis/src/main.rs
	modified:   ledger/src/blockstore_processor.rs
	modified:   local-cluster/src/local_cluster.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/builtins.rs
	modified:   runtime/src/message_processor.rs
	modified:   sdk/src/abi_example.rs
	modified:   sdk/src/clock.rs
	modified:   sdk/src/entrypoint_native.rs

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

	both modified:   genesis-programs/src/lib.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 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 simulator.

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

* Implement Debug for MessageProcessor

* Switch from delta-based gating to whole-set gating

* Remove dbg!

* Fix clippy

* Clippy

* Add test

* add loader to stable operating mode at proper epoch

* refresh_programs_and_inflation after ancestor setup

* Callback via snapshot; avoid account re-add; Debug

* Fix test

* Fix test and fix the past history

* Make callback management stricter and cleaner

* Fix test

* Test overwrite and frozen for native programs

* Test epoch callback with genesis-programs

* Add assertions for parent bank

* Add tests and some minor cleaning

* Remove unsteady assertion...

* Fix test...

* Fix DOS

* Skip ensuring account by dual (whole/delta) gating

* Fix frozen abi implementation...

* Move compute budget constatnt init back into bank

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
(cherry picked from commit db4bbb3)

# Conflicts:
#	genesis-programs/src/lib.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Aug 25, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 25, 2020

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Aug 25, 2020
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Aug 25, 2020
@mergify
Copy link
Contributor Author

mergify bot commented Aug 25, 2020

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 Aug 25, 2020
@codecov
Copy link

codecov bot commented Aug 25, 2020

Codecov Report

Merging #11837 into v1.3 will increase coverage by 0.0%.
The diff coverage is 86.7%.

@@           Coverage Diff           @@
##            v1.3   #11837    +/-   ##
=======================================
  Coverage   82.2%    82.2%            
=======================================
  Files        331      331            
  Lines      77401    77692   +291     
=======================================
+ Hits       63632    63873   +241     
- Misses     13769    13819    +50     

@mergify mergify bot merged commit d5d1a34 into v1.3 Aug 25, 2020
@mergify mergify bot deleted the mergify/bp/v1.3/pr-11750 branch August 25, 2020 19:00
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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