contracts: Add salt argument to contract instantiation (#7482)

* pallet-contracts: Fix seal_restore_to to output proper module errors

Those errors where part of the decl_error for some time but where
never actually returned. This allows proper debugging of failed
restorations. Previously, any error did return the misleading
`ContractTrapped`.

* Bind UncheckedFrom<T::Hash> + AsRef<[u8]> everywhere

This allows us to make assumptions about the AccoutId
that are necessary for testing and in order to benchmark
the module properly.

This also groups free standing functions into inherent functions
in order to minimize the places where the new bounds need to
be specified.

* Rework contract address determination

* Do not allow override by runtime author
* Instantiate gained a new parameter "salt"

This change is done now in expecation of the upcoming code rent
which needs to change the instantiation dispatchable and
host function anyways.

The situation in where we have only something that is like CREATE2
makes it impossible for UIs to help the user to create an arbitrary
amount of instantiations from the same code.

With this change we have the same functionality as ethereum with
a CREATE and CREATE2 instantation semantic.

* Remove TrieIdGenerator

The new trait bounds allows us to remove this workaround
from the configuration trait.

* Remove default parameters for config trait

It should be solely the responsiblity to determine proper values for
these parameter. As a matter of fact most runtime weren't using these
values anyways.

* Fix tests for new account id type

Because of the new bounds on the trait tests can't get away by using
u64 as accound id. Replacing the 8 byte value by a 32 byte value
creates out quite a bit of code churn.

* Fix benchmarks

The benchmarks need adaption to the new instantiate semantics.

* Fix compile errors caused by adding new trait bounds
* Fix compile errors caused by renaming storage and rent functions
* Adapt host functions and dispatchables to the new salt
* Add tests for instantiate host functions (was not possible before)

* Add benchmark results

* Adapt to the new WeightInfo

The new benchmarks add a new parameter for salt "s" to the instantiate weights
that needs to be applied.

* Fix deploying_wasm_contract_should_work integration test

This test is adapted to use the new instantiate signature.

* Break overlong line

* Break more long lines

Co-authored-by: Parity Benchmarking Bot <admin@parity.io>
This commit is contained in:
Alexander Theißen
2020-11-24 11:42:20 +01:00
committed by GitHub
parent 26830a20df
commit c3ca78fae3
26 changed files with 2186 additions and 2161 deletions
@@ -4,7 +4,9 @@
(import "seal0" "seal_set_storage" (func $seal_set_storage (param i32 i32 i32)))
(import "seal0" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
(import "seal0" "seal_transfer" (func $seal_transfer (param i32 i32 i32 i32) (result i32)))
(import "seal0" "seal_instantiate" (func $seal_instantiate (param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)))
(import "seal0" "seal_instantiate" (func $seal_instantiate
(param i32 i32 i64 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
))
(import "env" "memory" (memory 1 1))
;; [0, 8) Endowment to send when creating contract.
@@ -16,14 +18,18 @@
;; [48, 80) Buffer where to store the input to the contract
;; [80, 88) Buffer where to store the address of the instantiated contract
;; [88, 96) Size of the buffer
(data (i32.const 88) "\08")
(data (i32.const 88) "\FF")
;; [96, 100) Size of the input buffer
(data (i32.const 96) "\20")
;; [100, 132) Buffer where to store the address of the instantiated contract
;; [132, 134) Salt
(data (i32.const 132) "\47\11")
(func $assert (param i32)
(block $ok
(br_if $ok
@@ -54,10 +60,12 @@
(i32.const 8) ;; Length of the buffer with value to transfer.
(i32.const 0) ;; Pointer to input data buffer address
(i32.const 0) ;; Length of input data buffer
(i32.const 80) ;; Buffer where to store address of new contract
(i32.const 100) ;; Buffer where to store address of new contract
(i32.const 88) ;; Pointer to the length of the buffer
(i32.const 4294967295) ;; u32 max sentinel value: do not copy output
(i32.const 0) ;; Length is ignored in this cas
(i32.const 0) ;; Length is ignored in this case
(i32.const 132) ;; salt_ptr
(i32.const 2) ;; salt_len
)
(i32.const 0)
)
@@ -67,15 +75,15 @@
(call $assert
(i32.eq
(i32.load (i32.const 88))
(i32.const 8)
(i32.const 32)
)
)
;; Store the return address.
(call $seal_set_storage
(i32.const 16) ;; Pointer to the key
(i32.const 80) ;; Pointer to the value
(i32.const 8) ;; Length of the value
(i32.const 100) ;; Pointer to the value
(i32.const 32) ;; Length of the value
)
)
@@ -85,7 +93,7 @@
(i32.eq
(call $seal_get_storage
(i32.const 16) ;; Pointer to the key
(i32.const 80) ;; Pointer to the value
(i32.const 100) ;; Pointer to the value
(i32.const 88) ;; Pointer to the len of the value
)
(i32.const 0)
@@ -94,7 +102,7 @@
(call $assert
(i32.eq
(i32.load (i32.const 88))
(i32.const 8)
(i32.const 32)
)
)
@@ -102,8 +110,8 @@
(call $assert
(i32.eq
(call $seal_call
(i32.const 80) ;; Pointer to destination address
(i32.const 8) ;; Length of destination address
(i32.const 100) ;; Pointer to destination address
(i32.const 32) ;; Length of destination address
(i64.const 0) ;; How much gas to devote for the execution. 0 = all.
(i32.const 0) ;; Pointer to the buffer with value to transfer
(i32.const 8) ;; Length of the buffer with value to transfer
@@ -121,8 +129,8 @@
(call $assert
(i32.eq
(call $seal_call
(i32.const 80) ;; Pointer to destination address
(i32.const 8) ;; Length of destination address
(i32.const 100) ;; Pointer to destination address
(i32.const 32) ;; Length of destination address
(i64.const 0) ;; How much gas to devote for the execution. 0 = all.
(i32.const 8) ;; Pointer to the buffer with value to transfer
(i32.const 8) ;; Length of the buffer with value to transfer
@@ -141,8 +149,8 @@
(call $assert
(i32.eq
(call $seal_transfer
(i32.const 80) ;; Pointer to destination address
(i32.const 8) ;; Length of destination address
(i32.const 100) ;; Pointer to destination address
(i32.const 32) ;; Length of destination address
(i32.const 0) ;; Pointer to the buffer with value to transfer
(i32.const 8) ;; Length of the buffer with value to transfer
)