Merge branch 'master' into na-is-rate-limited-label

paritytech · Mar 5, 2024 · fccb7ae · fccb7ae
2 parents d007188 + ec30d2f
commit fccb7ae
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/substrate/frame/contracts/uapi/src/host.rs b/substrate/frame/contracts/uapi/src/host.rs
@@ -180,7 +180,7 @@ pub trait HostFn {
 		flags: CallFlags,
 		callee: &[u8],
 		ref_time_limit: u64,
-		proof_time_limit: u64,
+		proof_size_limit: u64,
 		deposit: Option<&[u8]>,
 		value: &[u8],
 		input_data: &[u8],

diff --git a/substrate/frame/contracts/uapi/src/host/riscv32.rs b/substrate/frame/contracts/uapi/src/host/riscv32.rs
@@ -130,7 +130,7 @@ impl HostFn for HostFnImpl {
 		flags: CallFlags,
 		callee: &[u8],
 		ref_time_limit: u64,
-		proof_time_limit: u64,
+		proof_size_limit: u64,
 		deposit: Option<&[u8]>,
 		value: &[u8],
 		input_data: &[u8],

diff --git a/substrate/frame/contracts/uapi/src/host/wasm32.rs b/substrate/frame/contracts/uapi/src/host/wasm32.rs
@@ -223,7 +223,7 @@ mod sys {
 
 			pub fn weight_to_fee(
 				ref_time_limit: u64,
-				proof_time_limit: u64,
+				proof_size_limit: u64,
 				output_ptr: *mut u8,
 				output_len_ptr: *mut u32,
 			);
@@ -239,7 +239,7 @@ mod sys {
 				flags: u32,
 				callee_ptr: *const u8,
 				ref_time_limit: u64,
-				proof_time_limit: u64,
+				proof_size_limit: u64,
 				deposit_ptr: *const u8,
 				transferred_value_ptr: *const u8,
 				input_data_ptr: *const u8,
@@ -251,7 +251,7 @@ mod sys {
 			pub fn instantiate(
 				code_hash_ptr: *const u8,
 				ref_time_limit: u64,
-				proof_time_limit: u64,
+				proof_size_limit: u64,
 				deposit_ptr: *const u8,
 				value_ptr: *const u8,
 				input_ptr: *const u8,
@@ -487,7 +487,7 @@ impl HostFn for HostFnImpl {
 		flags: CallFlags,
 		callee: &[u8],
 		ref_time_limit: u64,
-		proof_time_limit: u64,
+		proof_size_limit: u64,
 		deposit: Option<&[u8]>,
 		value: &[u8],
 		input_data: &[u8],
@@ -501,7 +501,7 @@ impl HostFn for HostFnImpl {
 					flags.bits(),
 					callee.as_ptr(),
 					ref_time_limit,
-					proof_time_limit,
+					proof_size_limit,
 					deposit_ptr,
 					value.as_ptr(),
 					input_data.as_ptr(),