This repository has been archived by the owner on Nov 15, 2023. It is now read-only.
Adapt pallet-contracts to WeightV2
#12421
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
athei
added
A0-please_review
|
Closes #12410 |
ascjones
approved these changes
Oct 5, 2022
lexnv
reviewed
Oct 5, 2022
frame/contracts/src/tests.rs
Outdated
| @@ -824,6 +823,8 @@ fn deploy_and_call_other_contract() { | |||
| // Drop previous events | |||
| initialize_block(2); | |||
|
|
|||
| println!("--------------"); | |||
There was a problem hiding this comment.
Nope. Some leftover. Thanks.
lexnv
reviewed
Oct 5, 2022
| /// Used by backwards compatible extrinsics. We cannot just set the proof to zero | ||
| /// or an old `Call` will just fail. | ||
| fn compat_weight(gas_limit: OldWeight) -> Weight { | ||
| Weight::from(gas_limit).set_proof_size(u64::from(T::MaxCodeLen::get()) * 2) |
There was a problem hiding this comment.
Dumb question: Is the MacCodeLen * 2 always a sufficient approximation of gas?
There was a problem hiding this comment.
Depends on how many contracts you call and how big they are in a single transaction. This is just a ad-hoc solution to support in-storage Calls that might exist in a Scheduler of some runtime. This is very niche. You should use the dry-run to come up with a proper value and don't rely on this.
lexnv
approved these changes
Oct 5, 2022
|
bot merge |
|
Error: "Check reviews" status is not passing for paritytech/cumulus#1726 |
|
bot merge |
agryaznov
reviewed
Oct 5, 2022
ordian
added a commit
that referenced
this pull request
Oct 5, 2022
* master: (42 commits) Adapt `pallet-contracts` to WeightV2 (#12421) Improved election pallet testing (#12327) Bump prost to 0.11+ (#12419) Use saturating add for alliance::disband witness data (#12418) [Fix] Rename VoterBagsList -> VoterList to match pdot (#12416) client/beefy: small code improvements (#12414) BEEFY: Simplify hashing for pallet-beefy-mmr (#12393) Add @koute to `docs/CODEOWNERS` and update stale paths (#12408) docs/CODEOWNERS: add @acatangiu as MMR owner (#12406) Remove unnecessary Clone trait bounds on CountedStorageMap (#12402) Fix `Weight::is_zero` (#12396) Beefy on-demand justifications as a custom RequestResponse protocol (#12124) Remove contracts RPCs (#12358) pallet-mmr: generate historical proofs (#12324) unsafe_pruning flag removed (#12385) Carry over where clauses defined in Config to Call and Hook (#12388) Properly set the max proof size weight on defaults and tests (#12383) BEEFY: impl TypeInfo for SignedCommitment (#12382) bounding staking: `BoundedElectionProvider` trait (#12362) New Pallet: Root offences (#11943) ...
4 tasks
ark0f
pushed a commit
to gear-tech/substrate
that referenced
this pull request
Feb 27, 2023
* Replace contract access weight by proper PoV component * Return the whole weight struct from dry-runs * Fixup `seal_call` and `seal_instantiate` * Fix duplicate extrinsics * Remove ContractAccessWeight from runtime * Fix doc link * Remove leftover debugging output
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A few changes were necessary to make
pallet-contractscompatible with the new weight.Remove
ContractAccessWeightThis was a workaround used to emulate the huge PoV impact generated by loading a contract. This is now replaced by setting the
proof_sizeto the size of the loaded contract. This is an underestimation but the whole system is just in place to prevent the worst offenders. Charging for anything else is missing anyways and will come later.Return the whole
Weightstruct from dry runsDry runs now include the
proof_sizeso that clients can use this to learn about how muchproof_sizea transaction will consume.Fix inter contract calls
seal_callandseal_instantiateallow only setting 1D weight. Eventually we need to add new versions of those. But the old versions need fixing, too. Current behavior is to setproof_sizeto0which is not a good default. It will prevent the callee to do anything useful. This PR sets theproof_sizeto "inherit" which allows it to use all of the remaining proof size from the overarching limit.Fix compatibility extrinsics
When adding the 2D weight we also added
*_old_weightcompat extrinsics to allow in-storage extrinsics to be still decoded. However, they also setproof_sizeto0which makes them useless. This PR sets some sensible default so they continue working. We also removed duplication in docs and code from them.cumulus companion: paritytech/cumulus#1726
Closes #12410