diff --git a/Cargo.lock b/Cargo.lock index 308dcc44112..c9265cc82e4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -765,15 +765,6 @@ dependencies = [ "serde", ] -[[package]] -name = "brownstone" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ea61398f34f1395ccbeb046fb68c87b631d1f34567fed0f0f11fa35d18d8d" -dependencies = [ - "arrayvec 0.7.4", -] - [[package]] name = "bs58" version = "0.5.0" @@ -1109,34 +1100,6 @@ dependencies = [ "url", ] -[[package]] -name = "contract-transcode" -version = "4.0.0-rc.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bf87e763e9b67379c987c68749d55676a0e14878f38048c120165ecc3c4214" -dependencies = [ - "anyhow", - "base58", - "blake2", - "contract-metadata", - "escape8259", - "hex", - "indexmap 2.2.4", - "ink_env 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ink_metadata 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.12.1", - "nom", - "nom-supreme", - "parity-scale-codec", - "primitive-types", - "scale-info", - "serde", - "serde_json", - "strsim 0.11.0", - "thiserror", - "tracing", -] - [[package]] name = "convert_case" version = "0.4.0" @@ -1593,12 +1556,10 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "drink" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b656f1801a4714fa3d35ec4dff33f8e157a17e5772a19e953cbec0f0c9989b" +checksum = "5cf61b046fd28980ea52907795eeaeeb105875e01b5f8ac84c31544aaf1c3bb9" dependencies = [ - "contract-metadata", - "contract-transcode", "drink-test-macro", "frame-metadata 16.0.0", "frame-support", @@ -1610,7 +1571,6 @@ dependencies = [ "parity-scale-codec", "parity-scale-codec-derive", "scale-info", - "serde_json", "sp-externalities", "sp-io", "sp-runtime-interface", @@ -1620,9 +1580,9 @@ dependencies = [ [[package]] name = "drink-test-macro" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e6dde131c2f74134d628c5a66571999acdef4a719e5070ece7b537c3cc09d7" +checksum = "0f8fb3560116e20f9de0df0ccdf1fe5da2c91889b2332013989a4cc3c85138a6" dependencies = [ "cargo_metadata", "contract-build", @@ -1797,15 +1757,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "escape8259" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba4f4911e3666fcd7826997b4745c8224295a6f3072f1418c3067b97a67557ee" -dependencies = [ - "rustversion", -] - [[package]] name = "event-listener" version = "2.5.3" @@ -2587,12 +2538,6 @@ dependencies = [ "quote", ] -[[package]] -name = "indent_write" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3" - [[package]] name = "indexmap" version = "1.9.3" @@ -2626,12 +2571,12 @@ name = "ink" version = "5.0.0-rc.2" dependencies = [ "derive_more", - "ink_env 5.0.0-rc.2", + "ink_env", "ink_ir", "ink_macro", - "ink_metadata 5.0.0-rc.2", - "ink_prelude 5.0.0-rc.2", - "ink_primitives 5.0.0-rc.2", + "ink_metadata", + "ink_prelude", + "ink_primitives", "ink_storage", "pallet-contracts-uapi-next", "parity-scale-codec", @@ -2648,15 +2593,6 @@ dependencies = [ "quickcheck_macros", ] -[[package]] -name = "ink_allocator" -version = "5.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db87a731bd2534af4629d5bbf84b2fa659010f020f490abe996e5f76cfbcfd4" -dependencies = [ - "cfg-if", -] - [[package]] name = "ink_codegen" version = "5.0.0-rc.2" @@ -2667,7 +2603,7 @@ dependencies = [ "heck", "impl-serde", "ink_ir", - "ink_primitives 5.0.0-rc.2", + "ink_primitives", "itertools 0.12.1", "parity-scale-codec", "proc-macro2", @@ -2688,8 +2624,8 @@ dependencies = [ "impl-serde", "ink", "ink_e2e_macro", - "ink_env 5.0.0-rc.2", - "ink_primitives 5.0.0-rc.2", + "ink_env", + "ink_primitives", "jsonrpsee 0.22.2", "pallet-contracts", "parity-scale-codec", @@ -2732,23 +2668,7 @@ version = "5.0.0-rc.2" dependencies = [ "blake2", "derive_more", - "ink_primitives 5.0.0-rc.2", - "pallet-contracts-uapi-next", - "parity-scale-codec", - "secp256k1", - "sha2 0.10.8", - "sha3", -] - -[[package]] -name = "ink_engine" -version = "5.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2b07ba4113fa49d1d36771190a666b74cd5cff4840be572fb8194af9ca034f" -dependencies = [ - "blake2", - "derive_more", - "ink_primitives 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_primitives", "pallet-contracts-uapi-next", "parity-scale-codec", "secp256k1", @@ -2765,41 +2685,11 @@ dependencies = [ "const_env", "derive_more", "ink", - "ink_allocator 5.0.0-rc.2", - "ink_engine 5.0.0-rc.2", - "ink_prelude 5.0.0-rc.2", - "ink_primitives 5.0.0-rc.2", - "ink_storage_traits 5.0.0-rc.2", - "num-traits", - "pallet-contracts-uapi-next", - "parity-scale-codec", - "paste", - "rlibc", - "scale-decode", - "scale-encode", - "scale-info", - "schnorrkel 0.11.4", - "secp256k1", - "sha2 0.10.8", - "sha3", - "static_assertions", -] - -[[package]] -name = "ink_env" -version = "5.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc1fd2c16521d8c585e7b0dbee65a9bbbb8d37cb78a57b57ca27a76bfc06266" -dependencies = [ - "blake2", - "cfg-if", - "const_env", - "derive_more", - "ink_allocator 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ink_engine 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ink_prelude 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ink_storage_traits 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_allocator", + "ink_engine", + "ink_prelude", + "ink_primitives", + "ink_storage_traits", "num-traits", "pallet-contracts-uapi-next", "parity-scale-codec", @@ -2822,7 +2712,7 @@ dependencies = [ "blake2", "either", "impl-serde", - "ink_prelude 5.0.0-rc.2", + "ink_prelude", "itertools 0.12.1", "proc-macro2", "quote", @@ -2835,11 +2725,11 @@ version = "5.0.0-rc.2" dependencies = [ "ink", "ink_codegen", - "ink_env 5.0.0-rc.2", + "ink_env", "ink_ir", - "ink_metadata 5.0.0-rc.2", - "ink_prelude 5.0.0-rc.2", - "ink_primitives 5.0.0-rc.2", + "ink_metadata", + "ink_prelude", + "ink_primitives", "ink_storage", "parity-scale-codec", "proc-macro2", @@ -2855,8 +2745,8 @@ version = "5.0.0-rc.2" dependencies = [ "derive_more", "impl-serde", - "ink_prelude 5.0.0-rc.2", - "ink_primitives 5.0.0-rc.2", + "ink_prelude", + "ink_primitives", "linkme", "parity-scale-codec", "pretty_assertions", @@ -2866,23 +2756,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "ink_metadata" -version = "5.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505fb52d8a5dccd6ca160d20aacb0f8d6f9e13f8a0f1f53bf05e8a4e083129ea" -dependencies = [ - "derive_more", - "impl-serde", - "ink_prelude 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "linkme", - "parity-scale-codec", - "scale-info", - "schemars", - "serde", -] - [[package]] name = "ink_prelude" version = "5.0.0-rc.2" @@ -2890,36 +2763,12 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "ink_prelude" -version = "5.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a69a99f23d3a0a2d173f81a2c57a055d9e46acc530634c79c54548b5b9deb7b9" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "ink_primitives" -version = "5.0.0-rc.2" -dependencies = [ - "derive_more", - "ink_prelude 5.0.0-rc.2", - "parity-scale-codec", - "scale-decode", - "scale-encode", - "scale-info", - "xxhash-rust", -] - [[package]] name = "ink_primitives" version = "5.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be98091b19e2e7f6cdc128b405863fbb6c59ef8e361f3a60589ef029f69f6a8" dependencies = [ "derive_more", - "ink_prelude 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ink_prelude", "parity-scale-codec", "scale-decode", "scale-encode", @@ -2935,11 +2784,11 @@ dependencies = [ "cfg-if", "derive_more", "ink", - "ink_env 5.0.0-rc.2", - "ink_metadata 5.0.0-rc.2", - "ink_prelude 5.0.0-rc.2", - "ink_primitives 5.0.0-rc.2", - "ink_storage_traits 5.0.0-rc.2", + "ink_env", + "ink_metadata", + "ink_prelude", + "ink_primitives", + "ink_storage_traits", "itertools 0.12.1", "pallet-contracts-uapi-next", "parity-scale-codec", @@ -2952,27 +2801,14 @@ dependencies = [ name = "ink_storage_traits" version = "5.0.0-rc.2" dependencies = [ - "ink_metadata 5.0.0-rc.2", - "ink_prelude 5.0.0-rc.2", - "ink_primitives 5.0.0-rc.2", + "ink_metadata", + "ink_prelude", + "ink_primitives", "parity-scale-codec", "paste", "scale-info", ] -[[package]] -name = "ink_storage_traits" -version = "5.0.0-rc.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fbbf0e1933ba34732ad9ca35a3d0da48934068759e97dbb5d34762e3ab3d4" -dependencies = [ - "ink_metadata 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ink_prelude 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ink_primitives 5.0.0-rc.2 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-scale-codec", - "scale-info", -] - [[package]] name = "inout" version = "0.1.3" @@ -3044,12 +2880,6 @@ dependencies = [ "libc", ] -[[package]] -name = "joinery" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" - [[package]] name = "js-sys" version = "0.3.68" @@ -3623,19 +3453,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "nom-supreme" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f909b25a8371ad5c054abc2c48205d677231e6a2dcbf83704ed57bb147f30e0" -dependencies = [ - "brownstone", - "indent_write", - "joinery", - "memchr", - "nom", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -3857,9 +3674,9 @@ dependencies = [ [[package]] name = "pallet-contracts-uapi-next" -version = "6.0.1" +version = "6.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e941fe56abf3b3d127c80d0a82989323f240ad81e6222421a56f1a3142db1e16" +checksum = "fd549c16296ea5b2eb7c65c56aba548b286c1be4d7675b424ff6ccb8319c97a9" dependencies = [ "bitflags 1.3.2", "paste", diff --git a/Cargo.toml b/Cargo.toml index 92e6243bf32..ef6a142e413 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,7 +40,7 @@ cfg-if = { version = "1.0" } contract-build = { version = "4.0.0-rc.3" } darling = { version = "0.20.8" } derive_more = { version = "0.99.17", default-features = false } -drink = { version = "=0.11.0" } +drink = { version = "=0.12.0", default-features = false, features = ["std"] } either = { version = "1.5", default-features = false } funty = { version = "2.0.0" } heck = { version = "0.4.0" } @@ -84,7 +84,7 @@ const_env = { version = "0.1"} # Substrate dependencies pallet-contracts = { version = "27.0.0", default-features = false } -pallet-contracts-uapi = { package = "pallet-contracts-uapi-next", version = "=6.0.1", default-features = false } +pallet-contracts-uapi = { package = "pallet-contracts-uapi-next", version = "=6.0.3", default-features = false } sp-core = { version = "28.0.0", default-features = false } sp-keyring = { version = "31.0.0", default-features = false } sp-runtime = { version = "31.0.1", default-features = false } diff --git a/crates/env/src/api.rs b/crates/env/src/api.rs index da22b62db8d..49b4540de32 100644 --- a/crates/env/src/api.rs +++ b/crates/env/src/api.rs @@ -308,7 +308,7 @@ where /// - If the called account is not a contract. /// - If arguments passed to the called contract message are invalid. /// - If the called contract execution has trapped. -/// - If the called contract ran out of gas, proof time, or storage deposit upon +/// - If the called contract ran out of gas, proof size, or storage deposit upon /// execution. /// - If the returned value failed to decode properly. pub fn invoke_contract( diff --git a/crates/env/src/call/call_builder.rs b/crates/env/src/call/call_builder.rs index 9429976b1bd..4970e85a340 100644 --- a/crates/env/src/call/call_builder.rs +++ b/crates/env/src/call/call_builder.rs @@ -104,10 +104,10 @@ where self.call_type.ref_time_limit } - /// Returns the chosen proof time limit for the called contract execution. + /// Returns the chosen proof size limit for the called contract execution. #[inline] - pub fn proof_time_limit(&self) -> u64 { - self.call_type.proof_time_limit + pub fn proof_size_limit(&self) -> u64 { + self.call_type.proof_size_limit } /// Returns the chosen storage deposit limit for the called contract execution. @@ -455,13 +455,13 @@ where } /// The default call type for cross-contract calls, for calling into the latest `call_v2` -/// host function. This adds the additional weight limit parameter `proof_time_limit` as +/// host function. This adds the additional weight limit parameter `proof_size_limit` as /// well as `storage_deposit_limit`. #[derive(Clone)] pub struct Call { callee: E::AccountId, ref_time_limit: u64, - proof_time_limit: u64, + proof_size_limit: u64, storage_deposit_limit: Option, transferred_value: E::Balance, } @@ -472,7 +472,7 @@ impl Call { Self { callee, ref_time_limit: Default::default(), - proof_time_limit: Default::default(), + proof_size_limit: Default::default(), storage_deposit_limit: None, transferred_value: E::Balance::zero(), } @@ -724,10 +724,10 @@ where } } - /// Sets the `proof_time_limit` part of the weight limit for the current + /// Sets the `proof_size_limit` part of the weight limit for the current /// cross-contract call. /// - /// `proof_time` refers to the amount of storage in bytes that a transaction + /// `proof_size` refers to the amount of storage in bytes that a transaction /// is allowed to read. You can find more info /// [here](https://use.ink/basics/cross-contract-calling/). /// @@ -735,11 +735,11 @@ where /// /// This limit is only relevant for parachains, not for standalone chains which do not /// require sending a Proof-of-validity to the relay chain. - pub fn proof_time_limit(self, proof_time_limit: Gas) -> Self { + pub fn proof_size_limit(self, proof_size_limit: Gas) -> Self { let call_type = self.call_type.value(); CallBuilder { call_type: Set(Call { - proof_time_limit, + proof_size_limit, ..call_type }), ..self diff --git a/crates/env/src/call/create_builder.rs b/crates/env/src/call/create_builder.rs index 5e5230d4dd9..9177c33a975 100644 --- a/crates/env/src/call/create_builder.rs +++ b/crates/env/src/call/create_builder.rs @@ -180,7 +180,7 @@ where E: Environment, { ref_time_limit: u64, - proof_time_limit: u64, + proof_size_limit: u64, storage_deposit_limit: Option, } @@ -250,11 +250,11 @@ where self.limits.ref_time_limit } - /// Gets the `proof_time_limit` part of the weight limit for the contract + /// Gets the `proof_size_limit` part of the weight limit for the contract /// instantiation. #[inline] - pub fn proof_time_limit(&self) -> u64 { - self.limits.proof_time_limit + pub fn proof_size_limit(&self) -> u64 { + self.limits.proof_size_limit } /// Gets the `storage_deposit_limit` for the contract instantiation. @@ -519,7 +519,7 @@ where code_hash: Default::default(), limits: Set(LimitParamsV2 { ref_time_limit: 0, - proof_time_limit: 0, + proof_size_limit: 0, storage_deposit_limit: None, }), endowment: Default::default(), @@ -636,13 +636,13 @@ where } } - /// Sets the `proof_time_limit` part of the weight limit for the contract + /// Sets the `proof_size_limit` part of the weight limit for the contract /// instantiation. #[inline] - pub fn proof_time_limit(self, proof_time_limit: u64) -> Self { + pub fn proof_size_limit(self, proof_size_limit: u64) -> Self { CreateBuilder { limits: Set(LimitParamsV2 { - proof_time_limit, + proof_size_limit, ..self.limits.value() }), ..self diff --git a/crates/env/src/engine/off_chain/impls.rs b/crates/env/src/engine/off_chain/impls.rs index f400cc32966..89432be93ba 100644 --- a/crates/env/src/engine/off_chain/impls.rs +++ b/crates/env/src/engine/off_chain/impls.rs @@ -495,7 +495,7 @@ impl TypedEnvBackend for EnvInstance { { let _code_hash = params.code_hash(); let _ref_time_limit = params.ref_time_limit(); - let _proof_time_limit = params.proof_time_limit(); + let _proof_size_limit = params.proof_size_limit(); let _storage_deposit_limit = params.storage_deposit_limit(); let _endowment = params.endowment(); let _input = params.exec_input(); diff --git a/crates/env/src/engine/on_chain/impls.rs b/crates/env/src/engine/on_chain/impls.rs index 31b04599288..47568e38f61 100644 --- a/crates/env/src/engine/on_chain/impls.rs +++ b/crates/env/src/engine/on_chain/impls.rs @@ -478,7 +478,7 @@ impl TypedEnvBackend for EnvInstance { { let mut scope = self.scoped_buffer(); let ref_time_limit = params.ref_time_limit(); - let proof_time_limit = params.proof_time_limit(); + let proof_size_limit = params.proof_size_limit(); let storage_deposit_limit = params .storage_deposit_limit() .map(|limit| &*scope.take_encoded(limit)); @@ -499,7 +499,7 @@ impl TypedEnvBackend for EnvInstance { *flags, enc_callee, ref_time_limit, - proof_time_limit, + proof_size_limit, storage_deposit_limit, enc_transferred_value, enc_input, @@ -563,7 +563,7 @@ impl TypedEnvBackend for EnvInstance { { let mut scoped = self.scoped_buffer(); let ref_time_limit = params.ref_time_limit(); - let proof_time_limit = params.proof_time_limit(); + let proof_size_limit = params.proof_size_limit(); let storage_deposit_limit = params .storage_deposit_limit() .map(|limit| &*scoped.take_encoded(limit)); @@ -577,7 +577,7 @@ impl TypedEnvBackend for EnvInstance { let instantiate_result = ext::instantiate_v2( enc_code_hash, ref_time_limit, - proof_time_limit, + proof_size_limit, storage_deposit_limit, enc_endowment, enc_input, diff --git a/crates/ink/src/env_access.rs b/crates/ink/src/env_access.rs index a60df70dbd7..8476f421ff1 100644 --- a/crates/ink/src/env_access.rs +++ b/crates/ink/src/env_access.rs @@ -465,7 +465,7 @@ where /// let create_params = build_create::() /// .code_hash(Hash::from([0x42; 32])) /// .ref_time_limit(500_000_000) - /// .proof_time_limit(100_000) + /// .proof_size_limit(100_000) /// .storage_deposit_limit(500_000_000_000) /// .endowment(25) /// .exec_input( @@ -707,7 +707,7 @@ where /// let call_params = build_call::() /// .call(AccountId::from([0x42; 32])) /// .ref_time_limit(500_000_000) - /// .proof_time_limit(100_000) + /// .proof_size_limit(100_000) /// .storage_deposit_limit(1_000_000_000) /// .exec_input( /// ExecutionInput::new(Selector::new([0xCA, 0xFE, 0xBA, 0xBE])) diff --git a/integration-tests/cross-contract-calls/e2e_tests.rs b/integration-tests/cross-contract-calls/e2e_tests.rs index ea66516d204..26d168aa0ad 100644 --- a/integration-tests/cross-contract-calls/e2e_tests.rs +++ b/integration-tests/cross-contract-calls/e2e_tests.rs @@ -46,13 +46,13 @@ async fn instantiate_v2_with_insufficient_storage_deposit_limit( .expect("other_contract upload failed"); const REF_TIME_LIMIT: u64 = 500_000_000; - const PROOF_TIME_LIMIT: u64 = 100_000; + const PROOF_SIZE_LIMIT: u64 = 100_000; const STORAGE_DEPOSIT_LIMIT: u128 = 500_000_000_000; let mut constructor = CrossContractCallsRef::new_v2_with_limits( other_contract_code.code_hash, REF_TIME_LIMIT, - PROOF_TIME_LIMIT, + PROOF_SIZE_LIMIT, STORAGE_DEPOSIT_LIMIT, ); let contract = client @@ -147,13 +147,13 @@ async fn flip_and_get_v2(mut client: Client) -> E2EResult<() let mut call_builder = contract.call_builder::(); const REF_TIME_LIMIT: u64 = 500_000_000; - const PROOF_TIME_LIMIT: u64 = 100_000; + const PROOF_SIZE_LIMIT: u64 = 100_000; const STORAGE_DEPOSIT_LIMIT: u128 = 1_000_000_000; // when let call = call_builder.flip_and_get_invoke_v2_with_limits( REF_TIME_LIMIT, - PROOF_TIME_LIMIT, + PROOF_SIZE_LIMIT, STORAGE_DEPOSIT_LIMIT, ); let result = client diff --git a/integration-tests/cross-contract-calls/lib.rs b/integration-tests/cross-contract-calls/lib.rs index 335617158d8..297c544d2a6 100755 --- a/integration-tests/cross-contract-calls/lib.rs +++ b/integration-tests/cross-contract-calls/lib.rs @@ -18,7 +18,7 @@ mod cross_contract_calls { pub fn new_v2_with_limits( other_contract_code_hash: Hash, ref_time_limit: u64, - proof_time_limit: u64, + proof_size_limit: u64, storage_deposit_limit: Balance, ) -> Self { let other_contract = OtherContractRef::new(true) @@ -26,7 +26,7 @@ mod cross_contract_calls { .endowment(0) .salt_bytes([0xDE, 0xAD, 0xBE, 0xEF]) .ref_time_limit(ref_time_limit) - .proof_time_limit(proof_time_limit) + .proof_size_limit(proof_size_limit) .storage_deposit_limit(storage_deposit_limit) .instantiate(); @@ -82,7 +82,7 @@ mod cross_contract_calls { pub fn flip_and_get_invoke_v2_with_limits( &mut self, ref_time_limit: u64, - proof_time_limit: u64, + proof_size_limit: u64, storage_deposit_limit: Balance, ) -> bool { let call_builder = self.other_contract.call_mut(); @@ -90,14 +90,14 @@ mod cross_contract_calls { call_builder .flip() .ref_time_limit(ref_time_limit) - .proof_time_limit(proof_time_limit) + .proof_size_limit(proof_size_limit) .storage_deposit_limit(storage_deposit_limit) .invoke(); call_builder .get() .ref_time_limit(ref_time_limit) - .proof_time_limit(proof_time_limit) + .proof_size_limit(proof_size_limit) .storage_deposit_limit(storage_deposit_limit) .invoke() }