contracts: Make Origin information available #13708

juangirini · 2023-03-24T17:41:37Z

What does this PR do?

It allows root origin to call contracts, and add the caller_is_root method to the Ext trait to identify such a call. Note that Root is still not allowed in any of the other dispatchables (except for set_code that was unmodified).

What's changed?

A new enum has been created: Origin. It can be seen as a subset of the RuntimeOrigin with only the two accepted origins: Signed and Root. Note that Origin can only be Root if the caller is the origin.
A new function ensure_origin has been added to the Invokables trait to ensure that the given origin is allowed to invoke.
The ensure_signed in the dispatchables call, instantiate and instantiate_with_code has been removed and replaced with the Invokables::ensure_origin function that is called inside Invokables::run_guarded. This implies that calling one of any of these dispatchables would not be rejected at the top of the function but rather down the line, making the PostDispatchInfo.actual_weight be Some(x) instead of None (that was before).

New behaviours to consider

When the origin is root there is not any charge or refund of storage deposit.

frame/contracts/src/exec.rs

frame/contracts/src/lib.rs

frame/contracts/src/storage/meter.rs

paritytech-cicd-pr · 2023-05-01T11:04:30Z

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: test-linux-stable
Logs: https://gitlab.parity.io/parity/mirrors/substrate/-/jobs/2756749

athei · 2023-05-02T08:11:46Z

frame/contracts/src/benchmarking/mod.rs

@@ -534,6 +534,38 @@ benchmarks! {
 		let origin = RawOrigin::Signed(instance.caller.clone());
 	}: call(origin, instance.addr, 0u32.into(), Weight::MAX, None, vec![])

+	#[pov_mode = Measured]
+	seal_caller_is_root {


Yes you are right. Getters copy to memory not return on stack. Forgot about that. So you need to roll this back.

frame/contracts/src/wasm/runtime.rs

agryaznov

overall, lgtm

frame/contracts/src/exec.rs

frame/contracts/src/lib.rs

frame/contracts/src/wasm/runtime.rs

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

juangirini · 2023-05-02T12:49:15Z

bot merge

paritytech-processbot · 2023-05-02T12:49:24Z

Error: Statuses failed for b3c8445

juangirini · 2023-05-02T12:52:36Z

bot merge

paritytech-processbot · 2023-05-02T12:52:44Z

Error: Statuses failed for b3c8445

juangirini · 2023-05-02T12:54:09Z

bot rebase

…lable

paritytech-processbot · 2023-05-02T12:54:17Z

Rebased

juangirini · 2023-05-02T12:55:03Z

bot merge

paritytech-processbot · 2023-05-02T12:55:11Z

Waiting for commit status.

paritytech-processbot · 2023-05-02T13:43:56Z

Merge cancelled due to error. Error: Statuses failed for fe39e1f

juangirini · 2023-05-02T16:45:07Z

bot merge force

* contracts: allow root calls * contracts: update ContractOrigin * contracts: test allow root calls * contracts: rustfmt * contracts: test root caller traps * contracts: add Caller enum * contracts: improve some comments * contracts: improve some comments * contracts: format code with +nightly * contracts: fix failing tests * contracts: improve charte instantiate call when root origin * contract: refactor common, call and instantiate inputs * contracts: fix some failing test * contracts: trap caller when there is no account id * Update frame/contracts/src/lib.rs Co-authored-by: PG Herveou <pgherveou@gmail.com> * Update frame/contracts/src/exec.rs Co-authored-by: PG Herveou <pgherveou@gmail.com> * contracts: make `into_deposit` return zero when the origin is root * contracts: cargo fmt * contracts: charging and terminating tests refactored * contracts: improved errors * contracts: refactor & merge ContractOrigin cand Caller enums * Update frame/contracts/src/lib.rs Co-authored-by: Sasha Gryaznov <hi@agryaznov.com> * contracts: apply suggested pr changes * contracts: rename Caller to Origin * contracts: refactor run fn * contracts: cr improvements * contracts: allow root to use delegate call * contracts: add caller_is_root weight * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * contracts: add caller_is_root benchmarking * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * contracts: add caller_is_root benchmarking * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * contracts: add some minor improvements * contracts: make caller_is_root runtime fn unstable * contracts: fix failing wasm test * contracts: update benchmarking for origin_is_root * contracts: improve seal_caller_is_root benchmarking * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * contracts: add small pr improvements * contracts: fix broken tests after master merge * contracts: acknowledge the default storage deposit limit * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_contracts * contracts: move origin to CommonInput * contracts: add some extra tests * contracts: move ensure origin logic inside invokable::run_guarded * contracts: add minor improvements * contracts: fix caller_is_root benchmarking * contracts: improve function description * Update frame/contracts/src/lib.rs Co-authored-by: Sasha Gryaznov <hi@agryaznov.com> * Update frame/contracts/src/lib.rs Co-authored-by: Sasha Gryaznov <hi@agryaznov.com> * Update frame/contracts/src/wasm/runtime.rs Co-authored-by: Sasha Gryaznov <hi@agryaznov.com> * contracts: improve function description --------- Co-authored-by: parity-processbot <> Co-authored-by: PG Herveou <pgherveou@gmail.com> Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

juangirini added 10 commits March 24, 2023 12:55

contracts: allow root calls

7fe7728

contracts: update ContractOrigin

8fda4a6

contracts: test allow root calls

f52ba84

contracts: rustfmt

3705212

contracts: resolve merge conflicts

92a2322

contracts: test root caller traps

e25d27b

contracts: add Caller enum

04f0b31

contracts: improve some comments

b3a1ac7

contracts: improve some comments

0fc1c1d

contracts: format code with +nightly

e4aeec9

juangirini marked this pull request as ready for review March 28, 2023 10:35

juangirini requested a review from athei as a code owner March 28, 2023 10:35

juangirini requested a review from pgherveou March 28, 2023 10:47

pgherveou reviewed Mar 28, 2023

View reviewed changes

Merge branch 'master' into jg/make-origin-available

197efe9

juangirini changed the title ~~contracts: Make Origin information available~~ [WIP] contracts: Make Origin information available Mar 28, 2023

juangirini added 4 commits March 28, 2023 15:31

contracts: fix failing tests

f31b50d

contracts: improve charte instantiate call when root origin

2936439

contract: refactor common, call and instantiate inputs

aa91b3b

contracts: fix some failing test

99bfe7c

juangirini added A3-in_progress Pull request is in progress. No review needed at this stage. and removed A0-please_review Pull request needs code review. labels Mar 28, 2023

contracts: fix caller_is_root benchmarking

25235f6

juangirini requested a review from athei May 1, 2023 15:15

athei reviewed May 2, 2023

View reviewed changes

contracts: improve function description

a2e76f7

juangirini requested a review from athei May 2, 2023 09:37

agryaznov approved these changes May 2, 2023

View reviewed changes

athei approved these changes May 2, 2023

View reviewed changes

juangirini and others added 4 commits May 2, 2023 12:16

Update frame/contracts/src/lib.rs

32de518

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

Update frame/contracts/src/lib.rs

da9d6d8

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

Update frame/contracts/src/wasm/runtime.rs

225c8d4

Co-authored-by: Sasha Gryaznov <hi@agryaznov.com>

contracts: improve function description

b3c8445

juangirini removed the A0-please_review Pull request needs code review. label May 2, 2023

Merge remote-tracking branch 'origin/master' into jg/make-origin-avai…

fe39e1f

…lable

paritytech-processbot bot merged commit f49b178 into master May 2, 2023

paritytech-processbot bot deleted the jg/make-origin-available branch May 2, 2023 16:45

kiltbot mentioned this pull request Jun 21, 2023

1️⃣ [AUTOMATIC] Update Polkadot dependencies from 0.9.42 to 0.9.43 KILTprotocol/kilt-node#531

Closed

kacperzuk-neti mentioned this pull request Jun 23, 2023

Polkadot v0.9.43 liberland/liberland_substrate#295

Merged

15 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

contracts: Make Origin information available #13708

contracts: Make Origin information available #13708

juangirini commented Mar 24, 2023 •

edited

Loading

paritytech-cicd-pr commented May 1, 2023

athei May 2, 2023

agryaznov left a comment

juangirini commented May 2, 2023

paritytech-processbot bot commented May 2, 2023

juangirini commented May 2, 2023

paritytech-processbot bot commented May 2, 2023

juangirini commented May 2, 2023

paritytech-processbot bot commented May 2, 2023

juangirini commented May 2, 2023

paritytech-processbot bot commented May 2, 2023

paritytech-processbot bot commented May 2, 2023

juangirini commented May 2, 2023

contracts: Make Origin information available #13708

contracts: Make Origin information available #13708

Conversation

juangirini commented Mar 24, 2023 • edited Loading

What does this PR do?

What's changed?

New behaviours to consider

paritytech-cicd-pr commented May 1, 2023

athei May 2, 2023

Choose a reason for hiding this comment

agryaznov left a comment

Choose a reason for hiding this comment

juangirini commented May 2, 2023

paritytech-processbot bot commented May 2, 2023

juangirini commented May 2, 2023

paritytech-processbot bot commented May 2, 2023

juangirini commented May 2, 2023

paritytech-processbot bot commented May 2, 2023

juangirini commented May 2, 2023

paritytech-processbot bot commented May 2, 2023

paritytech-processbot bot commented May 2, 2023

juangirini commented May 2, 2023

juangirini commented Mar 24, 2023 •

edited

Loading