[contracts] Port host functions to Weight V2 and storage deposit limit

bin/node/runtime/src/lib.rs

@@ -1201,6 +1201,7 @@ impl pallet_tips::Config for Runtime {
 parameter_types! {
 	pub const DepositPerItem: Balance = deposit(1, 0);
 	pub const DepositPerByte: Balance = deposit(0, 1);
+	pub const DefaultDepositLimit: Balance = deposit(1024, 1024 * 1024);
 	pub Schedule: pallet_contracts::Schedule<Runtime> = Default::default();
 }
 
@@ -1219,6 +1220,7 @@ impl pallet_contracts::Config for Runtime {
 	type CallFilter = Nothing;
 	type DepositPerItem = DepositPerItem;
 	type DepositPerByte = DepositPerByte;
+	type DefaultDepositLimit = DefaultDepositLimit;
 	type CallStack = [pallet_contracts::Frame<Self>; 5];
 	type WeightPrice = pallet_transaction_payment::Pallet<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;

frame/contracts/README.md

@@ -1,6 +1,6 @@
-# Contract Module
+# Contracts Module
 
-The Contract module provides functionality for the runtime to deploy and execute WebAssembly smart-contracts.
+The Contracts module provides functionality for the runtime to deploy and execute WebAssembly smart-contracts.
 
 - [`Call`](https://paritytech.github.io/substrate/master/pallet_contracts/pallet/enum.Call.html)
 - [`Config`](https://paritytech.github.io/substrate/master/pallet_contracts/pallet/trait.Config.html)
@@ -63,9 +63,9 @@ directly. This makes sure that by default `pallet-contracts` does not expose any
 When setting up the `Schedule` for your runtime make sure to set `InstructionWeights::fallback`
 to a non zero value. The default is `0` and prevents the upload of any non deterministic code.
 
-An indeterministic code can be deployed on-chain by passing `Determinism::AllowIndeterministic`
+An indeterministic code can be deployed on-chain by passing `Determinism::Relaxed`
 to `upload_code`. A deterministic contract can then delegate call into it if and only if it
-is ran by using `bare_call` and passing `Determinism::AllowIndeterministic` to it. **Never use
+is ran by using `bare_call` and passing `Determinism::Relaxed` to it. **Never use
 this argument when the contract is called from an on-chain transaction.**
 
 ## Interface

frame/contracts/fixtures/call_with_limit.wat

@@ -1,8 +1,8 @@
-;; This expects [account_id, gas_limit] as input and calls the account_id with the supplied gas_limit.
+;; This expects [account_id, ref_time, proof_size] as input and calls the account_id with the supplied 2D Weight limit.
 ;; It returns the result of the call as output data.
 (module
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
-	(import "seal0" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal2" "call" (func $seal_call (param i32 i32 i64 i64 i32 i32 i32 i32 i32 i32) (result i32)))
 	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
@@ -13,24 +13,25 @@
 	(func (export "deploy"))
 
 	(func (export "call")
-		;; Receive the encoded call + gas_limit
+		;; Receive the encoded account_id, ref_time, proof_size
 		(call $seal_input
 			(i32.const 4)	;; Pointer to the input buffer
-			(i32.const 0)	;; Size of the length buffer
+			(i32.const 0)	;; Pointer to the length of the input buffer
 		)
 		(i32.store
 			(i32.const 0)
 			(call $seal_call
+				(i32.const 0) ;; Set no flag.
 				(i32.const 4) ;; Pointer to "callee" address.
-				(i32.const 32) ;; Length of "callee" address.
-				(i64.load (i32.const 36)) ;; How much gas to devote for the execution.
+				(i64.load (i32.const 36)) ;; How much ref_time to devote for the execution.
+				(i64.load (i32.const 44)) ;; How much proof_size to devote for the execution.
+				(i32.const 0xffffffff)	;; u32 max sentinel value: pass no deposit limit.
 				(i32.const 0) ;; Pointer to the buffer with value to transfer
-				(i32.const 0) ;; 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 0)  ;; Length of input data buffer
 				(i32.const 0xffffffff) ;; u32 max sentinel value: do not copy output
-				(i32.const 0) ;; Ptr to output buffer len
-			)
+				(i32.const 0) ;; Length is ignored in this case
+				)
 		)
 		(call $seal_return (i32.const 0) (i32.const 0) (i32.const 4))
 	)

frame/contracts/fixtures/caller_contract.wat

@@ -1,9 +1,9 @@
 (module
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
 	(import "seal0" "seal_balance" (func $seal_balance (param i32 i32)))
-	(import "seal0" "seal_call" (func $seal_call (param i32 i32 i64 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 "seal2" "call" (func $seal_call (param i32 i32 i64 i64 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal2" "instantiate" (func $seal_instantiate
+		(param i32 i64 i64 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
 	))
 	(import "env" "memory" (memory 1 1))
 
@@ -43,18 +43,18 @@
 		(set_local $exit_code
 			(call $seal_instantiate
 				(i32.const 24)	;; Pointer to the code hash.
-				(i32.const 32)	;; Length of the code hash.
-				(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
+				(i64.const 0)	;; How much ref_time weight to devote for the execution. 0 = all.
+				(i64.const 0)	;; How much proof_size weight to devote for the execution. 0 = all.
+				(i32.const 0xffffffff)	;; u32 max sentinel value: pass no deposit limit.
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
-				(i32.const 8)	;; Length of the buffer with value to transfer.
 				(i32.const 9)	;; Pointer to input data buffer address
 				(i32.const 7)	;; Length of input data buffer
-				(i32.const 4294967295) ;; u32 max sentinel value: do not copy address
-				(i32.const 0) ;; Length is ignored in this case
+				(i32.const 4294967295)	;; u32 max sentinel value: do not copy address
+				(i32.const 0)	;; Length is ignored in this case
 				(i32.const 4294967295) ;; u32 max sentinel value: do not copy output
-				(i32.const 0) ;; Length is ignored in this case
-				(i32.const 0) ;; salt_ptr
-				(i32.const 0) ;; salt_le
+				(i32.const 0)	;; Length is ignored in this case
+				(i32.const 0)	;; salt_ptr
+				(i32.const 0)	;; salt_le
 			)
 		)
 
@@ -63,22 +63,47 @@
 			(i32.eq (get_local $exit_code) (i32.const 2)) ;; ReturnCode::CalleeReverted
 		)
 
-		;; Fail to deploy the contract due to insufficient gas.
+		;; Fail to deploy the contract due to insufficient ref_time weight.
 		(set_local $exit_code
 			(call $seal_instantiate
 				(i32.const 24)	;; Pointer to the code hash.
-				(i32.const 32)	;; Length of the code hash.
-				(i64.const 1) ;; Supply too little gas
+				(i64.const 1)	;; Supply too little ref_time weight
+				(i64.const 0)	;; How much proof_size weight to devote for the execution. 0 = all.
+				(i32.const 0xffffffff)	;; u32 max sentinel value: pass no deposit limit.
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
-				(i32.const 8)	;; Length of the buffer with value to transfer.
 				(i32.const 8)	;; Pointer to input data buffer address
 				(i32.const 8)	;; Length of input data buffer
 				(i32.const 4294967295) ;; u32 max sentinel value: do not copy address
-				(i32.const 0) ;; Length is ignored in this case
+				(i32.const 0)	;; Length is ignored in this case
 				(i32.const 4294967295) ;; u32 max sentinel value: do not copy output
-				(i32.const 0) ;; Length is ignored in this case
-				(i32.const 0) ;; salt_ptr
-				(i32.const 0) ;; salt_le
+				(i32.const 0)	;; Length is ignored in this case
+				(i32.const 0)	;; salt_ptr
+				(i32.const 0)	;; salt_le
+
+			)
+		)
+
+		;; Check for special trap exit status.
+		(call $assert
+			(i32.eq (get_local $exit_code) (i32.const 1)) ;; ReturnCode::CalleeTrapped
+		)
+
+		;; Fail to deploy the contract due to insufficient ref_time weight.
+		(set_local $exit_code
+			(call $seal_instantiate
+				(i32.const 24)	;; Pointer to the code hash.
+				(i64.const 0)	;; How much ref_time weight to devote for the execution. 0 = all.
+				(i64.const 1)	;; Supply too little proof_size weight
+				(i32.const 0xffffffff)	;; u32 max sentinel value: pass no deposit limit.
+				(i32.const 0)	;; Pointer to the buffer with value to transfer
+				(i32.const 8)	;; Pointer to input data buffer address
+				(i32.const 8)	;; Length of input data buffer
+				(i32.const 4294967295)	;; u32 max sentinel value: do not copy address
+				(i32.const 0)	;; Length is ignored in this case
+				(i32.const 4294967295)	;; u32 max sentinel value: do not copy output
+				(i32.const 0)	;; Length is ignored in this case
+				(i32.const 0)	;; salt_ptr
+				(i32.const 0)	;; salt_le
 
 			)
 		)
@@ -98,18 +123,18 @@
 		(set_local $exit_code
 			(call $seal_instantiate
 				(i32.const 24)	;; Pointer to the code hash.
-				(i32.const 32)	;; Length of the code hash.
-				(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
+				(i64.const 0)	;; How much ref_time weight to devote for the execution. 0 = all.
+				(i64.const 0)	;; How much proof_size weight to devote for the execution. 0 = all.
+				(i32.const 0xffffffff)	;; u32 max sentinel value: pass no deposit limit.
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
-				(i32.const 8)	;; Length of the buffer with value to transfer.
 				(i32.const 8)	;; Pointer to input data buffer address
 				(i32.const 8)	;; Length of input data buffer
-				(i32.const 16) ;; Pointer to the address output buffer
-				(i32.sub (get_local $sp) (i32.const 4)) ;; Pointer to the address buffer length
-				(i32.const 4294967295) ;; u32 max sentinel value: do not copy output
-				(i32.const 0) ;; Length is ignored in this case
-				(i32.const 0) ;; salt_ptr
-				(i32.const 0) ;; salt_le
+				(i32.const 16)	;; Pointer to the address output buffer
+				(i32.sub (get_local $sp) (i32.const 4))	;; Pointer to the address buffer length
+				(i32.const 4294967295)	;; u32 max sentinel value: do not copy output
+				(i32.const 0)	;; Length is ignored in this case
+				(i32.const 0)	;; salt_ptr
+				(i32.const 0)	;; salt_le
 
 			)
 		)
@@ -139,15 +164,16 @@
 		;; Call the new contract and expect it to return failing exit code.
 		(set_local $exit_code
 			(call $seal_call
+				(i32.const 0)	;; Set no flag
 				(i32.const 16)	;; Pointer to "callee" address.
-				(i32.const 32)	;; Length of "callee" address.
-				(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
+				(i64.const 0)	;; How much ref_time weight to devote for the execution. 0 = all.
+				(i64.const 0)	;; How much proof_size weight to devote for the execution. 0 = all.
+				(i32.const 0xffffffff)	;; u32 max sentinel value: pass no deposit limit.
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
-				(i32.const 8)	;; Length of the buffer with value to transfer.
 				(i32.const 9)	;; Pointer to input data buffer address
 				(i32.const 7)	;; Length of input data buffer
-				(i32.sub (get_local $sp) (i32.const 4)) ;; Ptr to output buffer
-				(i32.sub (get_local $sp) (i32.const 8)) ;; Ptr to output buffer len
+				(i32.sub (get_local $sp) (i32.const 4))	;; Ptr to output buffer
+				(i32.sub (get_local $sp) (i32.const 8))	;; Ptr to output buffer len
 			)
 		)
 
@@ -167,18 +193,40 @@
 			)
 		)
 
-		;; Fail to call the contract due to insufficient gas.
+		;; Fail to call the contract due to insufficient ref_time weight.
 		(set_local $exit_code
 			(call $seal_call
+				(i32.const 0)	;; Set no flag
 				(i32.const 16)	;; Pointer to "callee" address.
-				(i32.const 32)	;; Length of "callee" address.
-				(i64.const 1) ;; Supply too little gas
+				(i64.const 1)	;; Supply too little ref_time weight
+				(i64.const 0)	;; How much proof_size weight to devote for the execution. 0 = all.
+				(i32.const 0xffffffff)	;; u32 max sentinel value: pass no deposit limit.
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
-				(i32.const 8)	;; Length of the buffer with value to transfer.
 				(i32.const 8)	;; Pointer to input data buffer address
 				(i32.const 8)	;; Length of input data buffer
-				(i32.const 4294967295) ;; u32 max sentinel value: do not copy output
-				(i32.const 0) ;; Length is ignored in this cas
+				(i32.const 4294967295)	;; u32 max sentinel value: do not copy output
+				(i32.const 0)	;; Length is ignored in this cas
+			)
+		)
+
+		;; Check for special trap exit status.
+		(call $assert
+			(i32.eq (get_local $exit_code) (i32.const 1)) ;; ReturnCode::CalleeTrapped
+		)
+
+		;; Fail to call the contract due to insufficient proof_size weight.
+		(set_local $exit_code
+			(call $seal_call
+				(i32.const 0)	;; Set no flag
+				(i32.const 16)	;; Pointer to "callee" address.
+				(i64.const 0)	;; How much ref_time weight to devote for the execution. 0 = all.
+				(i64.const 1)	;; Supply too little proof_size weight
+				(i32.const 0xffffffff)	;; u32 max sentinel value: pass no deposit limit.
+				(i32.const 0)	;; Pointer to the buffer with value to transfer
+				(i32.const 8)	;; Pointer to input data buffer address
+				(i32.const 8)	;; Length of input data buffer
+				(i32.const 4294967295)	;; u32 max sentinel value: do not copy output
+				(i32.const 0)	;; Length is ignored in this cas
 			)
 		)
 
@@ -202,15 +250,16 @@
 		;; Call the contract successfully.
 		(set_local $exit_code
 			(call $seal_call
+				(i32.const 0)	;; Set no flag
 				(i32.const 16)	;; Pointer to "callee" address.
-				(i32.const 32)	;; Length of "callee" address.
-				(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
+				(i64.const 0)	;; How much ref_time weight to devote for the execution. 0 = all.
+				(i64.const 0)	;; How much proof_size weight to devote for the execution. 0 = all.
+				(i32.const 0xffffffff)	;; u32 max sentinel value: pass no deposit limit.
 				(i32.const 0)	;; Pointer to the buffer with value to transfer
-				(i32.const 8)	;; Length of the buffer with value to transfer.
 				(i32.const 8)	;; Pointer to input data buffer address
 				(i32.const 8)	;; Length of input data buffer
-				(i32.sub (get_local $sp) (i32.const 4)) ;; Ptr to output buffer
-				(i32.sub (get_local $sp) (i32.const 8)) ;; Ptr to output buffer len
+				(i32.sub (get_local $sp) (i32.const 4))	;; Ptr to output buffer
+				(i32.sub (get_local $sp) (i32.const 8))	;; Ptr to output buffer len
 			)
 		)
 

frame/contracts/fixtures/create_storage_and_call.wat

@@ -2,7 +2,7 @@
 (module
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
 	(import "seal0" "seal_set_storage" (func $seal_set_storage (param i32 i32 i32)))
-	(import "seal1" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal2" "call" (func $seal_call (param i32 i32 i64 i64 i32 i32 i32 i32 i32 i32) (result i32)))
 	(import "env" "memory" (memory 1 1))
 
 	(func $assert (param i32)
@@ -20,7 +20,10 @@
     	;; store length of input buffer
         (i32.store (i32.const 0) (i32.const 512))
 
-        ;; copy input at address 4
+        ;; copy input at address 4:
+		;; first 4 bytes for the size of the storage to be created in callee
+		;; next 32 bytes are for the callee address
+		;; next bytes for the encoded deposit limit
         (call $seal_input (i32.const 4) (i32.const 0))
 
        	;; create 4 byte of storage before calling
@@ -34,8 +37,10 @@
 		(call $assert (i32.eqz
 			(call $seal_call
 				(i32.const 0) ;; No flags
-				(i32.const 8)  ;; Pointer to "callee" address.
-				(i64.const 0)  ;; How much gas to devote for the execution. 0 = all.
+				(i32.const 8)  ;; Pointer to "callee" address
+				(i64.const 0)  ;; How much ref_time to devote for the execution. 0 = all
+				(i64.const 0)  ;; How much proof_limit to devote for the execution. 0 = all
+				(i32.const 40) ;; Pointer to the storage deposit limit
 				(i32.const 512) ;; Pointer to the buffer with value to transfer
 				(i32.const 4) ;; Pointer to input data buffer address
 				(i32.const 4)  ;; Length of input data buffer

frame/contracts/fixtures/create_storage_and_instantiate.wat

@@ -0,0 +1,66 @@
+;; This instantiates another contract and passes some input to its constructor.
+(module
+	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
+	(import "seal0" "seal_set_storage" (func $seal_set_storage (param i32 i32 i32)))
+	(import "seal2" "instantiate" (func $seal_instantiate
+		(param i32 i64 i64 i32 i32 i32 i32 i32 i32 i32 i32 i32 i32) (result i32)
+	))
+	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
+	(import "env" "memory" (memory 1 1))
+
+	;; [0, 8) send 10_000 balance
+	(data (i32.const 48) "\10\27\00\00\00\00\00\00")
+
+	(func $assert (param i32)
+		(block $ok
+			(br_if $ok
+				(get_local 0)
+			)
+			(unreachable)
+		)
+	)
+
+    (func (export "deploy"))
+
+    (func (export "call")
+    	;; store length of input buffer
+        (i32.store (i32.const 0) (i32.const 512))
+    	;; store length of contract address
+        (i32.store (i32.const 84) (i32.const 32))
+
+        ;; copy input at address 4
+        (call $seal_input (i32.const 4) (i32.const 0))
+
+		;; memory layout is:
+		;; 	[0,4): size of input buffer
+		;; 	[4,8): size of the storage to be created in callee
+		;; 	[8,40): the code hash of the contract to instantiate
+		;; 	[40,48): for the encoded deposit limit
+		;; 	[48,52): value to transfer
+		;; 	[52,84): address of the deployed contract
+		;; 	[84,88): len of the address
+
+		;; instantiate a contract
+		(call $assert (i32.eqz
+;;		(i32.store
+;;		 (i32.const 64)
+		 (call $seal_instantiate
+				(i32.const 8)	;; Pointer to the code hash.
+				(i64.const 0)	;; How much ref_time weight to devote for the execution. 0 = all.
+				(i64.const 0)	;; How much proof_size weight to devote for the execution. 0 = all.
+				(i32.const 40)	;; Pointer to the storage deposit limit
+				(i32.const 48)	;; Pointer to the buffer with value to transfer
+				(i32.const 4)	;; Pointer to input data buffer address
+				(i32.const 4)	;; Length of input data buffer
+				(i32.const 52) 	;; Pointer to where to copy address
+				(i32.const 84)	;; Pointer to address len ptr
+				(i32.const 0xffffffff) ;; u32 max sentinel value: do not copy output
+				(i32.const 0)	;; Length is ignored in this case
+				(i32.const 0)	;; salt_ptr
+				(i32.const 0)	;; salt_len
+			)
+		))
+		;; return the deployed contract address
+		(call $seal_return (i32.const 0) (i32.const 52) (i32.const 32))
+	)
+)