From 679f1fc8f5899bf993ab83435af3b12df5f4e906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Tue, 9 May 2023 11:54:50 +0300 Subject: [PATCH 01/84] sdk/scenario-format: Handle mxsc json unpack --- .../examples/adder/scenarios/adder.scen.json | 2 +- contracts/examples/adder/wasm/Cargo.lock | 4 ++-- .../src/value_interpreter/file_loader.rs | 18 ++++++++++++++++++ .../src/value_interpreter/interpreter.rs | 8 +++++++- .../src/value_interpreter/prefixes.rs | 2 ++ sdk/scenario-format/tests/interpreter_test.rs | 15 +++++++++++++++ sdk/scenario-format/tests/test.json | 3 +++ 7 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 sdk/scenario-format/tests/test.json diff --git a/contracts/examples/adder/scenarios/adder.scen.json b/contracts/examples/adder/scenarios/adder.scen.json index cccfbaf22b..d0028b7ae8 100644 --- a/contracts/examples/adder/scenarios/adder.scen.json +++ b/contracts/examples/adder/scenarios/adder.scen.json @@ -24,7 +24,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/adder.wasm", + "contractCode": "mxsc:../output/adder.mxsc.json", "arguments": [ "5" ], diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock index 33cb672d1f..9ad2038a98 100755 --- a/contracts/examples/adder/wasm/Cargo.lock +++ b/contracts/examples/adder/wasm/Cargo.lock @@ -162,9 +162,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] diff --git a/sdk/scenario-format/src/value_interpreter/file_loader.rs b/sdk/scenario-format/src/value_interpreter/file_loader.rs index e2dfdaeb91..c7cf7de6bb 100644 --- a/sdk/scenario-format/src/value_interpreter/file_loader.rs +++ b/sdk/scenario-format/src/value_interpreter/file_loader.rs @@ -2,9 +2,16 @@ use std::{ fs, path::{Component, Path, PathBuf}, }; +use serde::{Deserialize, Serialize}; + use crate::interpret_trait::InterpreterContext; +#[derive(Serialize, Deserialize)] +pub struct MxscFileJson { + pub code: String, +} + pub fn load_file(file_path: &str, context: &InterpreterContext) -> Vec { let mut path_buf = context.context_path.clone(); path_buf.push(file_path); @@ -18,6 +25,17 @@ pub fn load_file(file_path: &str, context: &InterpreterContext) -> Vec { }) } +pub fn load_mxsc_file_json(mxsc_file_path: &str, context: &InterpreterContext) -> Vec { + let mxsc_json_file = load_file(mxsc_file_path, context); + let mxsc_json_file = match std::str::from_utf8(&mxsc_json_file) { + Ok(v) => v, + Err(e) => panic!("Invalid UTF-8 sequence: {}", e), + }; + + let mxsc_json: MxscFileJson = serde_json::from_str(mxsc_json_file).unwrap(); + mxsc_json.code.into() +} + fn missing_file_value(path_buf: &Path) -> Vec { let expr_str = format!("MISSING:{path_buf:?}"); expr_str.into_bytes() diff --git a/sdk/scenario-format/src/value_interpreter/interpreter.rs b/sdk/scenario-format/src/value_interpreter/interpreter.rs index 24d2524492..4fff526e31 100644 --- a/sdk/scenario-format/src/value_interpreter/interpreter.rs +++ b/sdk/scenario-format/src/value_interpreter/interpreter.rs @@ -1,6 +1,6 @@ use crate::{interpret_trait::InterpreterContext, serde_raw::ValueSubTree}; -use super::{file_loader::load_file, functions::*, parse_num::*, prefixes::*}; +use super::{file_loader::{load_file, load_mxsc_file_json}, functions::*, parse_num::*, prefixes::*}; pub fn interpret_subtree(vst: &ValueSubTree, context: &InterpreterContext) -> Vec { match vst { @@ -44,6 +44,7 @@ pub fn interpret_string(s: &str, context: &InterpreterContext) -> Vec { if s == "false" { return Vec::new(); } + println!("S = {}", s); for str_prefix in STR_PREFIXES.iter() { if let Some(stripped) = s.strip_prefix(str_prefix) { @@ -60,9 +61,14 @@ pub fn interpret_string(s: &str, context: &InterpreterContext) -> Vec { } if let Some(stripped) = s.strip_prefix(FILE_PREFIX) { + println!("in if stripped = {}", stripped); return load_file(stripped, context); } + if let Some(stripped) = s.strip_prefix(MXSC_PREFIX) { + return load_mxsc_file_json(stripped, context); + } + if let Some(stripped) = s.strip_prefix(KECCAK256_PREFIX) { let arg = interpret_string(stripped, context); return keccak256(arg.as_slice()); diff --git a/sdk/scenario-format/src/value_interpreter/prefixes.rs b/sdk/scenario-format/src/value_interpreter/prefixes.rs index 451ecd6a99..4b084cad2e 100644 --- a/sdk/scenario-format/src/value_interpreter/prefixes.rs +++ b/sdk/scenario-format/src/value_interpreter/prefixes.rs @@ -5,6 +5,8 @@ pub(super) const SC_ADDR_PREFIX: &str = "sc:"; pub(super) const FILE_PREFIX: &str = "file:"; pub(super) const KECCAK256_PREFIX: &str = "keccak256:"; pub(super) const BECH32_PREFIX: &str = "bech32:"; +pub(super) const MXSC_PREFIX: &str = "mxsc:"; + pub(super) const U64_PREFIX: &str = "u64:"; pub(super) const U32_PREFIX: &str = "u32:"; diff --git a/sdk/scenario-format/tests/interpreter_test.rs b/sdk/scenario-format/tests/interpreter_test.rs index 19dafb3453..f3eb65c398 100644 --- a/sdk/scenario-format/tests/interpreter_test.rs +++ b/sdk/scenario-format/tests/interpreter_test.rs @@ -31,6 +31,21 @@ fn test_string() { assert_eq!(EMPTY, interpret_string("str:", &context)); } +#[test] +fn test_mxsc_pack() { + let context = &InterpreterContext::default(); + assert_eq!(b"test".to_vec(), interpret_string("mxsc:tests/test.json", context)); + +} + +#[should_panic] +#[test] +fn test_mxsc_no_pack() { + let context = &InterpreterContext::default(); + assert_eq!(b"not found :\"no_file.json\"".to_vec(), interpret_string("mxsc:no_file.json", context)); +} + + #[test] fn test_address() { let context = InterpreterContext::default(); diff --git a/sdk/scenario-format/tests/test.json b/sdk/scenario-format/tests/test.json new file mode 100644 index 0000000000..4a24fb3239 --- /dev/null +++ b/sdk/scenario-format/tests/test.json @@ -0,0 +1,3 @@ +{ + "code": "test" +} \ No newline at end of file From 94b3b43de651bba770a7c2106c8e5512433c716b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Tue, 9 May 2023 11:55:52 +0300 Subject: [PATCH 02/84] sdk/scenario-format: Minor fixes --- .../src/value_interpreter/file_loader.rs | 3 +-- .../src/value_interpreter/interpreter.rs | 7 ++++++- .../src/value_interpreter/prefixes.rs | 1 - sdk/scenario-format/tests/interpreter_test.rs | 12 ++++++++---- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/sdk/scenario-format/src/value_interpreter/file_loader.rs b/sdk/scenario-format/src/value_interpreter/file_loader.rs index c7cf7de6bb..1eab3b190a 100644 --- a/sdk/scenario-format/src/value_interpreter/file_loader.rs +++ b/sdk/scenario-format/src/value_interpreter/file_loader.rs @@ -1,9 +1,8 @@ +use serde::{Deserialize, Serialize}; use std::{ fs, path::{Component, Path, PathBuf}, }; -use serde::{Deserialize, Serialize}; - use crate::interpret_trait::InterpreterContext; diff --git a/sdk/scenario-format/src/value_interpreter/interpreter.rs b/sdk/scenario-format/src/value_interpreter/interpreter.rs index 4fff526e31..308022eeb7 100644 --- a/sdk/scenario-format/src/value_interpreter/interpreter.rs +++ b/sdk/scenario-format/src/value_interpreter/interpreter.rs @@ -1,6 +1,11 @@ use crate::{interpret_trait::InterpreterContext, serde_raw::ValueSubTree}; -use super::{file_loader::{load_file, load_mxsc_file_json}, functions::*, parse_num::*, prefixes::*}; +use super::{ + file_loader::{load_file, load_mxsc_file_json}, + functions::*, + parse_num::*, + prefixes::*, +}; pub fn interpret_subtree(vst: &ValueSubTree, context: &InterpreterContext) -> Vec { match vst { diff --git a/sdk/scenario-format/src/value_interpreter/prefixes.rs b/sdk/scenario-format/src/value_interpreter/prefixes.rs index 4b084cad2e..7896bcf2a6 100644 --- a/sdk/scenario-format/src/value_interpreter/prefixes.rs +++ b/sdk/scenario-format/src/value_interpreter/prefixes.rs @@ -7,7 +7,6 @@ pub(super) const KECCAK256_PREFIX: &str = "keccak256:"; pub(super) const BECH32_PREFIX: &str = "bech32:"; pub(super) const MXSC_PREFIX: &str = "mxsc:"; - pub(super) const U64_PREFIX: &str = "u64:"; pub(super) const U32_PREFIX: &str = "u32:"; pub(super) const U16_PREFIX: &str = "u16:"; diff --git a/sdk/scenario-format/tests/interpreter_test.rs b/sdk/scenario-format/tests/interpreter_test.rs index f3eb65c398..d6add5c51a 100644 --- a/sdk/scenario-format/tests/interpreter_test.rs +++ b/sdk/scenario-format/tests/interpreter_test.rs @@ -34,18 +34,22 @@ fn test_string() { #[test] fn test_mxsc_pack() { let context = &InterpreterContext::default(); - assert_eq!(b"test".to_vec(), interpret_string("mxsc:tests/test.json", context)); - + assert_eq!( + b"test".to_vec(), + interpret_string("mxsc:tests/test.json", context) + ); } #[should_panic] #[test] fn test_mxsc_no_pack() { let context = &InterpreterContext::default(); - assert_eq!(b"not found :\"no_file.json\"".to_vec(), interpret_string("mxsc:no_file.json", context)); + assert_eq!( + b"not found :\"no_file.json\"".to_vec(), + interpret_string("mxsc:no_file.json", context) + ); } - #[test] fn test_address() { let context = InterpreterContext::default(); From a81576479ca9db31d96dd6886f65332cd83f4eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Tue, 9 May 2023 11:57:34 +0300 Subject: [PATCH 03/84] sdk/scenario-format: Remove debugging info --- sdk/scenario-format/src/value_interpreter/interpreter.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk/scenario-format/src/value_interpreter/interpreter.rs b/sdk/scenario-format/src/value_interpreter/interpreter.rs index 308022eeb7..b6157bbad8 100644 --- a/sdk/scenario-format/src/value_interpreter/interpreter.rs +++ b/sdk/scenario-format/src/value_interpreter/interpreter.rs @@ -49,8 +49,7 @@ pub fn interpret_string(s: &str, context: &InterpreterContext) -> Vec { if s == "false" { return Vec::new(); } - println!("S = {}", s); - + for str_prefix in STR_PREFIXES.iter() { if let Some(stripped) = s.strip_prefix(str_prefix) { return stripped.as_bytes().to_vec(); @@ -66,7 +65,6 @@ pub fn interpret_string(s: &str, context: &InterpreterContext) -> Vec { } if let Some(stripped) = s.strip_prefix(FILE_PREFIX) { - println!("in if stripped = {}", stripped); return load_file(stripped, context); } From 757eb1c1206fd3fef2997422f2bd5a095b0d1927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Tue, 9 May 2023 12:20:28 +0300 Subject: [PATCH 04/84] contracts/adder: Revert contract load mxsc -> file --- contracts/examples/adder/scenarios/adder.scen.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/examples/adder/scenarios/adder.scen.json b/contracts/examples/adder/scenarios/adder.scen.json index d0028b7ae8..cccfbaf22b 100644 --- a/contracts/examples/adder/scenarios/adder.scen.json +++ b/contracts/examples/adder/scenarios/adder.scen.json @@ -24,7 +24,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "mxsc:../output/adder.mxsc.json", + "contractCode": "file:../output/adder.wasm", "arguments": [ "5" ], From dbfea959f77864a07124cfe626662422bc376a97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Tue, 9 May 2023 14:12:16 +0300 Subject: [PATCH 05/84] adder: Fix test mxsc contractCode --- contracts/examples/adder/scenarios/adder.scen.json | 2 +- .../adder_mandos_constructed_with_calls_test.rs | 2 +- .../src/value_interpreter/file_loader.rs | 14 +++++--------- .../src/value_interpreter/interpreter.rs | 2 +- sdk/scenario-format/tests/test.json | 2 +- 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/contracts/examples/adder/scenarios/adder.scen.json b/contracts/examples/adder/scenarios/adder.scen.json index cccfbaf22b..79fe76e578 100644 --- a/contracts/examples/adder/scenarios/adder.scen.json +++ b/contracts/examples/adder/scenarios/adder.scen.json @@ -24,7 +24,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/adder.wasm", + "contractCode": "mxsc:output/adder.mxsc.json", "arguments": [ "5" ], diff --git a/contracts/examples/adder/tests/adder_mandos_constructed_with_calls_test.rs b/contracts/examples/adder/tests/adder_mandos_constructed_with_calls_test.rs index 28cc7d56ec..352e5acba2 100644 --- a/contracts/examples/adder/tests/adder_mandos_constructed_with_calls_test.rs +++ b/contracts/examples/adder/tests/adder_mandos_constructed_with_calls_test.rs @@ -28,7 +28,7 @@ fn adder_scenario_constructed_raw() { .sc_deploy_step( ScDeployStep::new() .from(owner_address) - .contract_code("file:output/adder.wasm", &ic) + .contract_code("mxsc:output/adder.mxsc.json", &ic) .call(adder_contract.init(5u32)) .gas_limit("5,000,000") .expect(TxExpect::ok().no_result()), diff --git a/sdk/scenario-format/src/value_interpreter/file_loader.rs b/sdk/scenario-format/src/value_interpreter/file_loader.rs index 1eab3b190a..4845f8a7f4 100644 --- a/sdk/scenario-format/src/value_interpreter/file_loader.rs +++ b/sdk/scenario-format/src/value_interpreter/file_loader.rs @@ -24,15 +24,11 @@ pub fn load_file(file_path: &str, context: &InterpreterContext) -> Vec { }) } -pub fn load_mxsc_file_json(mxsc_file_path: &str, context: &InterpreterContext) -> Vec { - let mxsc_json_file = load_file(mxsc_file_path, context); - let mxsc_json_file = match std::str::from_utf8(&mxsc_json_file) { - Ok(v) => v, - Err(e) => panic!("Invalid UTF-8 sequence: {}", e), - }; - - let mxsc_json: MxscFileJson = serde_json::from_str(mxsc_json_file).unwrap(); - mxsc_json.code.into() +pub fn load_mxsc_file_json(mxsc_file_path: &str) -> Vec { + let contents = fs::read_to_string(mxsc_file_path) + .unwrap_or_else(|e| panic!("not found: {} {:?}", e, mxsc_file_path)); + let mxsc_json: MxscFileJson = serde_json::from_str(contents.as_str()).unwrap(); + hex::decode(&mxsc_json.code).expect("Could not decode contract code") } fn missing_file_value(path_buf: &Path) -> Vec { diff --git a/sdk/scenario-format/src/value_interpreter/interpreter.rs b/sdk/scenario-format/src/value_interpreter/interpreter.rs index b6157bbad8..2ae2ae58fe 100644 --- a/sdk/scenario-format/src/value_interpreter/interpreter.rs +++ b/sdk/scenario-format/src/value_interpreter/interpreter.rs @@ -69,7 +69,7 @@ pub fn interpret_string(s: &str, context: &InterpreterContext) -> Vec { } if let Some(stripped) = s.strip_prefix(MXSC_PREFIX) { - return load_mxsc_file_json(stripped, context); + return load_mxsc_file_json(stripped); } if let Some(stripped) = s.strip_prefix(KECCAK256_PREFIX) { diff --git a/sdk/scenario-format/tests/test.json b/sdk/scenario-format/tests/test.json index 4a24fb3239..e5ccfe1e65 100644 --- a/sdk/scenario-format/tests/test.json +++ b/sdk/scenario-format/tests/test.json @@ -1,3 +1,3 @@ { - "code": "test" + "code": "74657374" } \ No newline at end of file From 99693c43cd526a5cf3ae7e543590e7668d00f2d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Tue, 9 May 2023 14:19:12 +0300 Subject: [PATCH 06/84] scenario-format: Fix clippy issue --- sdk/scenario-format/src/value_interpreter/file_loader.rs | 2 +- sdk/scenario-format/src/value_interpreter/interpreter.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/scenario-format/src/value_interpreter/file_loader.rs b/sdk/scenario-format/src/value_interpreter/file_loader.rs index 4845f8a7f4..350ca5a7d1 100644 --- a/sdk/scenario-format/src/value_interpreter/file_loader.rs +++ b/sdk/scenario-format/src/value_interpreter/file_loader.rs @@ -28,7 +28,7 @@ pub fn load_mxsc_file_json(mxsc_file_path: &str) -> Vec { let contents = fs::read_to_string(mxsc_file_path) .unwrap_or_else(|e| panic!("not found: {} {:?}", e, mxsc_file_path)); let mxsc_json: MxscFileJson = serde_json::from_str(contents.as_str()).unwrap(); - hex::decode(&mxsc_json.code).expect("Could not decode contract code") + hex::decode(mxsc_json.code).expect("Could not decode contract code") } fn missing_file_value(path_buf: &Path) -> Vec { diff --git a/sdk/scenario-format/src/value_interpreter/interpreter.rs b/sdk/scenario-format/src/value_interpreter/interpreter.rs index 2ae2ae58fe..a55fcdd0e0 100644 --- a/sdk/scenario-format/src/value_interpreter/interpreter.rs +++ b/sdk/scenario-format/src/value_interpreter/interpreter.rs @@ -49,7 +49,7 @@ pub fn interpret_string(s: &str, context: &InterpreterContext) -> Vec { if s == "false" { return Vec::new(); } - + for str_prefix in STR_PREFIXES.iter() { if let Some(stripped) = s.strip_prefix(str_prefix) { return stripped.as_bytes().to_vec(); From f726270dfe08395fef86cfbf1ccbe9f5e39c52dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Mon, 15 May 2023 16:21:32 +0300 Subject: [PATCH 07/84] Change the code path for mandos tests Change from "file:*.wasm" -> "mxsc:*.mxsc.json" --- .../linked-list-repeat/scenarios/linked_list_repeat.scen.json | 2 +- .../scenarios/linked_list_repeat_struct.scen.json | 2 +- .../mappers/map-repeat/scenarios/map_repeat.scen.json | 2 +- .../mappers/map-repeat/scenarios/map_repeat_struct.scen.json | 2 +- .../mappers/queue-repeat/scenarios/queue_repeat.scen.json | 2 +- .../queue-repeat/scenarios/queue_repeat_struct.scen.json | 2 +- .../mappers/set-repeat/scenarios/set_repeat.scen.json | 2 +- .../mappers/set-repeat/scenarios/set_repeat_struct.scen.json | 2 +- .../scenarios/single_value_repeat.scen.json | 2 +- .../scenarios/single_value_repeat_struct.scen.json | 2 +- .../mappers/vec-repeat/scenarios/vec_repeat.scen.json | 2 +- .../mappers/vec-repeat/scenarios/vec_repeat_struct.scen.json | 2 +- .../send-tx-repeat/scenarios/send_tx_repeat.scen.json | 2 +- .../benchmarks/str-repeat/scenarios/str_repeat.scen.json | 2 +- contracts/examples/adder/scenarios/adder.scen.json | 2 +- .../bonding-curve-contract/scenarios/deploy.scen.json | 2 +- .../crowdfunding-esdt/scenarios/crowdfunding-init.scen.json | 2 +- .../scenarios/egld-crowdfunding-init.scen.json | 2 +- contracts/examples/crypto-bubbles/scenarios/create.scen.json | 2 +- .../crypto-kitties/kitty-auction/scenarios/init.scen.json | 4 ++-- .../crypto-kitties/kitty-genetic-alg/scenarios/init.scen.json | 2 +- .../crypto-kitties/kitty-ownership/scenarios/init.scen.json | 4 ++-- .../examples/digital-cash/scenarios/set-accounts.scen.json | 2 +- contracts/examples/empty/scenarios/empty.scen.json | 2 +- .../esdt-transfer-with-fee/scenarios/deploy.scen.json | 2 +- .../examples/lottery-esdt/scenarios/lottery-init.scen.json | 2 +- .../examples/multisig/scenarios/deploy_duplicate_bm.scen.json | 2 +- .../examples/multisig/scenarios/remove_everyone.scen.json | 2 +- contracts/examples/multisig/scenarios/steps/deploy.steps.json | 4 ++-- .../multisig/scenarios/steps/deploy_minimal.steps.json | 2 +- contracts/examples/nft-minter/scenarios/init.scen.json | 2 +- .../order-book/pair/scenarios/steps/deploy.steps.json | 2 +- .../ping-pong-egld/scenarios/ping-pong-init.scen.json | 2 +- contracts/examples/proxy-pause/scenarios/init.scen.json | 2 +- .../examples/token-release/scenarios/test-init.scen.json | 2 +- .../basic-features/scenarios/sc_properties.scen.json | 2 +- .../composability/esdt-contract-pair/scenarios/init.scen.json | 4 ++-- .../composability/scenarios/forw_raw_init_async.scen.json | 2 +- .../scenarios/forw_raw_init_sync_accept_egld.scen.json | 2 +- .../composability/scenarios/forw_raw_init_sync_echo.scen.json | 2 +- .../scenarios/deploy_erc20_and_crowdfunding.scen.json | 4 ++-- .../erc-style-contracts/erc1155/scenarios/deploy.scen.json | 2 +- .../erc-style-contracts/erc721/scenarios/nft-init.scen.json | 2 +- .../lottery-erc20/scenarios/lottery-init.scen.json | 4 ++-- .../crypto-bubbles-legacy/scenarios/create.scen.json | 2 +- .../multi-contract-features/scenarios/mcf-alt-init.scen.json | 2 +- .../scenarios/mcf-external-get.scen.json | 4 ++-- .../scenarios/use_module_claim_developer_rewards.scen.json | 2 +- .../use-module/scenarios/use_module_features.scen.json | 2 +- .../use-module/scenarios/use_module_internal.scen.json | 2 +- .../use-module/scenarios/use_module_only_admin.scen.json | 2 +- .../use-module/scenarios/use_module_only_owner.scen.json | 2 +- .../use-module/scenarios/use_module_pause.scen.json | 2 +- 53 files changed, 60 insertions(+), 60 deletions(-) diff --git a/contracts/benchmarks/mappers/linked-list-repeat/scenarios/linked_list_repeat.scen.json b/contracts/benchmarks/mappers/linked-list-repeat/scenarios/linked_list_repeat.scen.json index 03b37a4152..7ab02c670f 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/scenarios/linked_list_repeat.scen.json +++ b/contracts/benchmarks/mappers/linked-list-repeat/scenarios/linked_list_repeat.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/linked-list-repeat.wasm", + "contractCode": "mxsc:../output/linked-list-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/linked-list-repeat/scenarios/linked_list_repeat_struct.scen.json b/contracts/benchmarks/mappers/linked-list-repeat/scenarios/linked_list_repeat_struct.scen.json index af6ef7739d..951fefb3da 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/scenarios/linked_list_repeat_struct.scen.json +++ b/contracts/benchmarks/mappers/linked-list-repeat/scenarios/linked_list_repeat_struct.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/linked-list-repeat.wasm", + "contractCode": "mxsc:../output/linked-list-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/map-repeat/scenarios/map_repeat.scen.json b/contracts/benchmarks/mappers/map-repeat/scenarios/map_repeat.scen.json index cba04d1e94..0e3ce0eb21 100644 --- a/contracts/benchmarks/mappers/map-repeat/scenarios/map_repeat.scen.json +++ b/contracts/benchmarks/mappers/map-repeat/scenarios/map_repeat.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/map-repeat.wasm", + "contractCode": "mxsc:../output/map-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/map-repeat/scenarios/map_repeat_struct.scen.json b/contracts/benchmarks/mappers/map-repeat/scenarios/map_repeat_struct.scen.json index c4913245f3..f150ba550f 100644 --- a/contracts/benchmarks/mappers/map-repeat/scenarios/map_repeat_struct.scen.json +++ b/contracts/benchmarks/mappers/map-repeat/scenarios/map_repeat_struct.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/map-repeat.wasm", + "contractCode": "mxsc:../output/map-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/queue-repeat/scenarios/queue_repeat.scen.json b/contracts/benchmarks/mappers/queue-repeat/scenarios/queue_repeat.scen.json index dc7bcfe5f0..5cebd6bd2e 100644 --- a/contracts/benchmarks/mappers/queue-repeat/scenarios/queue_repeat.scen.json +++ b/contracts/benchmarks/mappers/queue-repeat/scenarios/queue_repeat.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/queue-repeat.wasm", + "contractCode": "mxsc:../output/queue-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/queue-repeat/scenarios/queue_repeat_struct.scen.json b/contracts/benchmarks/mappers/queue-repeat/scenarios/queue_repeat_struct.scen.json index cda441928a..73afa14697 100644 --- a/contracts/benchmarks/mappers/queue-repeat/scenarios/queue_repeat_struct.scen.json +++ b/contracts/benchmarks/mappers/queue-repeat/scenarios/queue_repeat_struct.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/queue-repeat.wasm", + "contractCode": "mxsc:../output/queue-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/set-repeat/scenarios/set_repeat.scen.json b/contracts/benchmarks/mappers/set-repeat/scenarios/set_repeat.scen.json index 5500bf9e08..37cf2a9360 100644 --- a/contracts/benchmarks/mappers/set-repeat/scenarios/set_repeat.scen.json +++ b/contracts/benchmarks/mappers/set-repeat/scenarios/set_repeat.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/set-repeat.wasm", + "contractCode": "mxsc:../output/set-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/set-repeat/scenarios/set_repeat_struct.scen.json b/contracts/benchmarks/mappers/set-repeat/scenarios/set_repeat_struct.scen.json index 20b733830c..22881ee764 100644 --- a/contracts/benchmarks/mappers/set-repeat/scenarios/set_repeat_struct.scen.json +++ b/contracts/benchmarks/mappers/set-repeat/scenarios/set_repeat_struct.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/set-repeat.wasm", + "contractCode": "mxsc:../output/set-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/single-value-repeat/scenarios/single_value_repeat.scen.json b/contracts/benchmarks/mappers/single-value-repeat/scenarios/single_value_repeat.scen.json index bdd75956f0..069bc32392 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/scenarios/single_value_repeat.scen.json +++ b/contracts/benchmarks/mappers/single-value-repeat/scenarios/single_value_repeat.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/single-value-repeat.wasm", + "contractCode": "mxsc:../output/single-value-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/single-value-repeat/scenarios/single_value_repeat_struct.scen.json b/contracts/benchmarks/mappers/single-value-repeat/scenarios/single_value_repeat_struct.scen.json index f0d22495be..27d471c0fa 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/scenarios/single_value_repeat_struct.scen.json +++ b/contracts/benchmarks/mappers/single-value-repeat/scenarios/single_value_repeat_struct.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/single-value-repeat.wasm", + "contractCode": "mxsc:../output/single-value-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/vec-repeat/scenarios/vec_repeat.scen.json b/contracts/benchmarks/mappers/vec-repeat/scenarios/vec_repeat.scen.json index 44c08c9e16..f432343eb2 100644 --- a/contracts/benchmarks/mappers/vec-repeat/scenarios/vec_repeat.scen.json +++ b/contracts/benchmarks/mappers/vec-repeat/scenarios/vec_repeat.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/vec-repeat.wasm", + "contractCode": "mxsc:../output/vec-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/mappers/vec-repeat/scenarios/vec_repeat_struct.scen.json b/contracts/benchmarks/mappers/vec-repeat/scenarios/vec_repeat_struct.scen.json index 8e3d54983d..64069d5470 100644 --- a/contracts/benchmarks/mappers/vec-repeat/scenarios/vec_repeat_struct.scen.json +++ b/contracts/benchmarks/mappers/vec-repeat/scenarios/vec_repeat_struct.scen.json @@ -24,7 +24,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/vec-repeat.wasm", + "contractCode": "mxsc:../output/vec-repeat.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/send-tx-repeat/scenarios/send_tx_repeat.scen.json b/contracts/benchmarks/send-tx-repeat/scenarios/send_tx_repeat.scen.json index 4bbb0339ac..ea27df06ef 100644 --- a/contracts/benchmarks/send-tx-repeat/scenarios/send_tx_repeat.scen.json +++ b/contracts/benchmarks/send-tx-repeat/scenarios/send_tx_repeat.scen.json @@ -26,7 +26,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/send-tx-repeat.wasm", + "contractCode": "mxsc:../output/send-tx-repeat.mxsc.json", "arguments": [], "gasLimit": "100,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/str-repeat/scenarios/str_repeat.scen.json b/contracts/benchmarks/str-repeat/scenarios/str_repeat.scen.json index 017e524385..7393d950db 100644 --- a/contracts/benchmarks/str-repeat/scenarios/str_repeat.scen.json +++ b/contracts/benchmarks/str-repeat/scenarios/str_repeat.scen.json @@ -22,7 +22,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/str-repeat.wasm", + "contractCode": "mxsc:../output/str-repeat.mxsc.json", "arguments": [], "gasLimit": "2,000,000", "gasPrice": "0" diff --git a/contracts/examples/adder/scenarios/adder.scen.json b/contracts/examples/adder/scenarios/adder.scen.json index cccfbaf22b..d0028b7ae8 100644 --- a/contracts/examples/adder/scenarios/adder.scen.json +++ b/contracts/examples/adder/scenarios/adder.scen.json @@ -24,7 +24,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/adder.wasm", + "contractCode": "mxsc:../output/adder.mxsc.json", "arguments": [ "5" ], diff --git a/contracts/examples/bonding-curve-contract/scenarios/deploy.scen.json b/contracts/examples/bonding-curve-contract/scenarios/deploy.scen.json index ec9af18cc5..12440bdd50 100644 --- a/contracts/examples/bonding-curve-contract/scenarios/deploy.scen.json +++ b/contracts/examples/bonding-curve-contract/scenarios/deploy.scen.json @@ -106,7 +106,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/bonding-curve-contract.wasm", + "contractCode": "mxsc:../output/bonding-curve-contract.mxsc.json", "arguments": [], "gasLimit": "15,000,000", "gasPrice": "0" diff --git a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-init.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-init.scen.json index 8ad105d802..cee345bb5d 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-init.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-init.scen.json @@ -22,7 +22,7 @@ "id": "deploy", "tx": { "from": "address:my_address", - "contractCode": "file:../output/crowdfunding-esdt.wasm", + "contractCode": "mxsc:../output/crowdfunding-esdt.mxsc.json", "arguments": [ "500,000,000,000", "123,000", diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json index 533e8abe19..7fc88527a1 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json @@ -22,7 +22,7 @@ "id": "deploy", "tx": { "from": "address:my_address", - "contractCode": "file:../output/crowdfunding-esdt.wasm", + "contractCode": "mxsc:../output/crowdfunding-esdt.mxsc.json", "arguments": [ "500,000,000,000", "123,000", diff --git a/contracts/examples/crypto-bubbles/scenarios/create.scen.json b/contracts/examples/crypto-bubbles/scenarios/create.scen.json index 017adddce6..699a36fdc6 100644 --- a/contracts/examples/crypto-bubbles/scenarios/create.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/create.scen.json @@ -23,7 +23,7 @@ "id": "1", "tx": { "from": "address:crypto_bubbles_owner", - "contractCode": "file:../output/crypto-bubbles.wasm", + "contractCode": "mxsc:../output/crypto-bubbles.mxsc.json", "arguments": [], "gasLimit": "0x100000", "gasPrice": "0x01" diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/init.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/init.scen.json index 032deab851..80951bdf93 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/init.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/init.scen.json @@ -29,7 +29,7 @@ "comment": "we don't care about autoBirthFee in this test, so we set it to 0", "tx": { "from": "address:my_address", - "contractCode": "file:../../kitty-ownership/output/kitty-ownership.wasm", + "contractCode": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json", "arguments": [ "0" ], @@ -49,7 +49,7 @@ "id": "deploy - kitty auction contract", "tx": { "from": "address:my_address", - "contractCode": "file:../output/kitty-auction.wasm", + "contractCode": "mxsc:../output/kitty-auction.mxsc.json", "arguments": [ "100", "500", diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/scenarios/init.scen.json b/contracts/examples/crypto-kitties/kitty-genetic-alg/scenarios/init.scen.json index a88e88a6ed..95705ae5c6 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/scenarios/init.scen.json +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/scenarios/init.scen.json @@ -23,7 +23,7 @@ "id": "deploy", "tx": { "from": "address:my_address", - "contractCode": "file:../output/kitty-genetic-alg.wasm", + "contractCode": "mxsc:../output/kitty-genetic-alg.mxsc.json", "arguments": [], "gasLimit": "1,000,000", "gasPrice": "0" diff --git a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/init.scen.json b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/init.scen.json index 32fcb5bb60..6dddacfe59 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/init.scen.json +++ b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/init.scen.json @@ -31,7 +31,7 @@ "id": "deploy - kitty genetic alg contract", "tx": { "from": "address:my_address", - "contractCode": "file:../../kitty-genetic-alg/output/kitty-genetic-alg.wasm", + "contractCode": "mxsc:../../kitty-genetic-alg/output/kitty-genetic-alg.mxsc.json", "arguments": [], "gasLimit": "1,000,000", "gasPrice": "0" @@ -49,7 +49,7 @@ "id": "deploy - kitty ownership contract", "tx": { "from": "address:my_address", - "contractCode": "file:../output/kitty-ownership.wasm", + "contractCode": "mxsc:../output/kitty-ownership.mxsc.json", "arguments": [ "10", "sc:kitty_genetic_alg", diff --git a/contracts/examples/digital-cash/scenarios/set-accounts.scen.json b/contracts/examples/digital-cash/scenarios/set-accounts.scen.json index ad67410199..acf8ed847e 100644 --- a/contracts/examples/digital-cash/scenarios/set-accounts.scen.json +++ b/contracts/examples/digital-cash/scenarios/set-accounts.scen.json @@ -33,7 +33,7 @@ "id": "deploy", "tx": { "from": "address:digital_cash_owner_address", - "contractCode": "file:../output/digital-cash.wasm", + "contractCode": "mxsc:../output/digital-cash.mxsc.json", "arguments": [], "gasLimit": "5,000,000", "gasPrice": "0" diff --git a/contracts/examples/empty/scenarios/empty.scen.json b/contracts/examples/empty/scenarios/empty.scen.json index 486088b592..2c9ab7d083 100644 --- a/contracts/examples/empty/scenarios/empty.scen.json +++ b/contracts/examples/empty/scenarios/empty.scen.json @@ -22,7 +22,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/empty.wasm", + "contractCode": "mxsc:../output/empty.mxsc.json", "arguments": [], "gasLimit": "5,000,000", "gasPrice": "0" diff --git a/contracts/examples/esdt-transfer-with-fee/scenarios/deploy.scen.json b/contracts/examples/esdt-transfer-with-fee/scenarios/deploy.scen.json index 6f18b1cf45..d6b63ae309 100644 --- a/contracts/examples/esdt-transfer-with-fee/scenarios/deploy.scen.json +++ b/contracts/examples/esdt-transfer-with-fee/scenarios/deploy.scen.json @@ -54,7 +54,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/esdt-transfer-with-fee.wasm", + "contractCode": "mxsc:../output/esdt-transfer-with-fee.mxsc.json", "arguments": [], "gasLimit": "5,000,000", "gasPrice": "0" diff --git a/contracts/examples/lottery-esdt/scenarios/lottery-init.scen.json b/contracts/examples/lottery-esdt/scenarios/lottery-init.scen.json index 145619b314..3a4fb6c52a 100644 --- a/contracts/examples/lottery-esdt/scenarios/lottery-init.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/lottery-init.scen.json @@ -31,7 +31,7 @@ "id": "deploy", "tx": { "from": "address:my_address", - "contractCode": "file:../output/lottery-esdt.wasm", + "contractCode": "mxsc:../output/lottery-esdt.mxsc.json", "arguments": [], "gasLimit": "1,000,000", "gasPrice": "0" diff --git a/contracts/examples/multisig/scenarios/deploy_duplicate_bm.scen.json b/contracts/examples/multisig/scenarios/deploy_duplicate_bm.scen.json index b9f1f382b8..d7c85582a1 100644 --- a/contracts/examples/multisig/scenarios/deploy_duplicate_bm.scen.json +++ b/contracts/examples/multisig/scenarios/deploy_duplicate_bm.scen.json @@ -10,7 +10,7 @@ "id": "multisig-deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/multisig.wasm", + "contractCode": "mxsc:../output/multisig.mxsc.json", "arguments": [ "2", "address:alice", diff --git a/contracts/examples/multisig/scenarios/remove_everyone.scen.json b/contracts/examples/multisig/scenarios/remove_everyone.scen.json index 604eb538e0..bb7ecdcf35 100644 --- a/contracts/examples/multisig/scenarios/remove_everyone.scen.json +++ b/contracts/examples/multisig/scenarios/remove_everyone.scen.json @@ -9,7 +9,7 @@ "id": "multisig-deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/multisig.wasm", + "contractCode": "mxsc:../output/multisig.mxsc.json", "arguments": [ "1", "address:alice" diff --git a/contracts/examples/multisig/scenarios/steps/deploy.steps.json b/contracts/examples/multisig/scenarios/steps/deploy.steps.json index 3f3796ce4f..f20d372564 100644 --- a/contracts/examples/multisig/scenarios/steps/deploy.steps.json +++ b/contracts/examples/multisig/scenarios/steps/deploy.steps.json @@ -7,7 +7,7 @@ "id": "multisig-deploy", "tx": { "from": "address:owner", - "contractCode": "file:../../output/multisig.wasm", + "contractCode": "mxsc:../../output/multisig.mxsc.json", "arguments": [ "2", "address:alice", @@ -30,7 +30,7 @@ "id": "multisig-view-deploy", "tx": { "from": "address:owner", - "contractCode": "file:../../output/multisig-view.wasm", + "contractCode": "mxsc:../../output/multisig-view.mxsc.json", "arguments": [ "sc:multisig" ], diff --git a/contracts/examples/multisig/scenarios/steps/deploy_minimal.steps.json b/contracts/examples/multisig/scenarios/steps/deploy_minimal.steps.json index fc8e846176..c8aeccebc9 100644 --- a/contracts/examples/multisig/scenarios/steps/deploy_minimal.steps.json +++ b/contracts/examples/multisig/scenarios/steps/deploy_minimal.steps.json @@ -5,7 +5,7 @@ "id": "multisig-deploy", "tx": { "from": "address:owner", - "contractCode": "file:../../output/multisig.wasm", + "contractCode": "mxsc:../../output/multisig.mxsc.json", "arguments": [ "0", "address:alice" diff --git a/contracts/examples/nft-minter/scenarios/init.scen.json b/contracts/examples/nft-minter/scenarios/init.scen.json index 59f84128b5..6ff69b59e9 100644 --- a/contracts/examples/nft-minter/scenarios/init.scen.json +++ b/contracts/examples/nft-minter/scenarios/init.scen.json @@ -41,7 +41,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/nft-minter.wasm", + "contractCode": "mxsc:../output/nft-minter.mxsc.json", "arguments": [], "gasLimit": "10,000,000", "gasPrice": "0" diff --git a/contracts/examples/order-book/pair/scenarios/steps/deploy.steps.json b/contracts/examples/order-book/pair/scenarios/steps/deploy.steps.json index 0923c12285..7d76b2b4df 100644 --- a/contracts/examples/order-book/pair/scenarios/steps/deploy.steps.json +++ b/contracts/examples/order-book/pair/scenarios/steps/deploy.steps.json @@ -16,7 +16,7 @@ "id": "deploy-router", "tx": { "from": "address:owner", - "contractCode": "file:../../output/order-book-pair.wasm", + "contractCode": "mxsc:../../output/order-book-pair.mxsc.json", "arguments": [ "str:WEGLD-abcdef", "str:BUSD-abcdef" diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-init.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-init.scen.json index f11c609c13..e5136069d8 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-init.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-init.scen.json @@ -31,7 +31,7 @@ "id": "deploy", "tx": { "from": "address:my_address", - "contractCode": "file:../output/ping-pong-egld.wasm", + "contractCode": "mxsc:../output/ping-pong-egld.mxsc.json", "arguments": [ "500,000,000,000", "123,000", diff --git a/contracts/examples/proxy-pause/scenarios/init.scen.json b/contracts/examples/proxy-pause/scenarios/init.scen.json index b92e2af69f..ae3734bc56 100644 --- a/contracts/examples/proxy-pause/scenarios/init.scen.json +++ b/contracts/examples/proxy-pause/scenarios/init.scen.json @@ -29,7 +29,7 @@ "id": "1-deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/proxy-pause.wasm", + "contractCode": "mxsc:../output/proxy-pause.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/examples/token-release/scenarios/test-init.scen.json b/contracts/examples/token-release/scenarios/test-init.scen.json index e0392c4f1c..fd3822703a 100644 --- a/contracts/examples/token-release/scenarios/test-init.scen.json +++ b/contracts/examples/token-release/scenarios/test-init.scen.json @@ -37,7 +37,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/token-release.wasm", + "contractCode": "mxsc:../output/token-release.mxsc.json", "arguments": [ "str:FIRSTTOKEN-123456" ], diff --git a/contracts/feature-tests/basic-features/scenarios/sc_properties.scen.json b/contracts/feature-tests/basic-features/scenarios/sc_properties.scen.json index 787d2a3f1a..e9d54d212d 100644 --- a/contracts/feature-tests/basic-features/scenarios/sc_properties.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/sc_properties.scen.json @@ -75,7 +75,7 @@ "id": "1", "tx": { "from": "address:an_account", - "contractCode": "file:../output/basic-features.wasm", + "contractCode": "mxsc:../output/basic-features.mxsc.json", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/scenarios/init.scen.json b/contracts/feature-tests/composability/esdt-contract-pair/scenarios/init.scen.json index 05573ed441..365776cb72 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/scenarios/init.scen.json +++ b/contracts/feature-tests/composability/esdt-contract-pair/scenarios/init.scen.json @@ -28,7 +28,7 @@ "id": "deploy-first-contract", "tx": { "from": "address:owner", - "contractCode": "file:../first-contract/output/first-contract.wasm", + "contractCode": "mxsc:../first-contract/output/first-contract.mxsc.json", "arguments": [ "str:cool_token", "sc:second_contract" @@ -48,7 +48,7 @@ "id": "deploy-second-contract", "tx": { "from": "address:owner", - "contractCode": "file:../second-contract/output/second-contract.wasm", + "contractCode": "mxsc:../second-contract/output/second-contract.mxsc.json", "arguments": [ "str:cool_token" ], diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_init_async.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_init_async.scen.json index 0095ed9dc2..6038c78465 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_init_async.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_init_async.scen.json @@ -26,7 +26,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../forwarder-raw/output/forwarder-raw-init-async-call.wasm", + "contractCode": "mxsc:../forwarder-raw/output/forwarder-raw-init-async-call.mxsc.json", "arguments": [ "sc:vault", "str:echo_arguments", diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json index 5fc148b2e4..1839818d65 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json @@ -26,7 +26,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../forwarder-raw/output/forwarder-raw-init-sync-call.wasm", + "contractCode": "mxsc:../forwarder-raw/output/forwarder-raw-init-sync-call.mxsc.json", "egldValue": "1000", "arguments": [ "sc:vault", diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_echo.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_echo.scen.json index ece56f50d9..701d65bc5b 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_echo.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_echo.scen.json @@ -26,7 +26,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../forwarder-raw/output/forwarder-raw-init-sync-call.wasm", + "contractCode": "mxsc:../forwarder-raw/output/forwarder-raw-init-sync-call.mxsc.json", "arguments": [ "sc:vault", "str:echo_arguments", diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/deploy_erc20_and_crowdfunding.scen.json b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/deploy_erc20_and_crowdfunding.scen.json index ab45dfe82b..67d3cc88d7 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/deploy_erc20_and_crowdfunding.scen.json +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/deploy_erc20_and_crowdfunding.scen.json @@ -31,7 +31,7 @@ "id": "deploy", "tx": { "from": "address:erc20_owner", - "contractCode": "file:../../erc20/output/erc20.wasm", + "contractCode": "mxsc:../../erc20/output/erc20.mxsc.json", "arguments": [ "1,000,000,000" ], @@ -74,7 +74,7 @@ "id": "deploy", "tx": { "from": "address:crowdfunding_owner", - "contractCode": "file:../output/crowdfunding-erc20.wasm", + "contractCode": "mxsc:../output/crowdfunding-erc20.mxsc.json", "arguments": [ "1,000,000", "123,456", diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/deploy.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/deploy.scen.json index 8b9ac37974..a11105f743 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/deploy.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/deploy.scen.json @@ -23,7 +23,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/erc1155.wasm", + "contractCode": "mxsc:../output/erc1155.mxsc.json", "arguments": [], "gasLimit": "0x100000", "gasPrice": "0x00" diff --git a/contracts/feature-tests/erc-style-contracts/erc721/scenarios/nft-init.scen.json b/contracts/feature-tests/erc-style-contracts/erc721/scenarios/nft-init.scen.json index ea1e311eb3..619d168ae4 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/scenarios/nft-init.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc721/scenarios/nft-init.scen.json @@ -22,7 +22,7 @@ "id": "deploy", "tx": { "from": "address:contract_owner", - "contractCode": "file:../output/erc721.wasm", + "contractCode": "mxsc:../output/erc721.mxsc.json", "arguments": [ "3" ], diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/lottery-init.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/lottery-init.scen.json index d70cbc7388..3f932a8b59 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/lottery-init.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/lottery-init.scen.json @@ -40,7 +40,7 @@ "id": "deploy", "tx": { "from": "address:erc20_owner", - "contractCode": "file:../../erc20/output/erc20.wasm", + "contractCode": "mxsc:../../erc20/output/erc20.mxsc.json", "arguments": [ "1,000,000,000" ], @@ -93,7 +93,7 @@ "id": "deploy", "tx": { "from": "address:my_address", - "contractCode": "file:../output/lottery-erc20.wasm", + "contractCode": "mxsc:../output/lottery-erc20.mxsc.json", "arguments": [ "sc:erc20" ], diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/create.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/create.scen.json index b9e4892029..fb22d7f142 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/create.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/create.scen.json @@ -23,7 +23,7 @@ "id": "1", "tx": { "from": "address:crypto_bubbles_owner", - "contractCode": "file:../output/crypto-bubbles-legacy.wasm", + "contractCode": "mxsc:../output/crypto-bubbles-legacy.mxsc.json", "arguments": [], "gasLimit": "0x100000", "gasPrice": "0x01" diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-alt-init.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-alt-init.scen.json index 09737a1ffd..a398ce53b1 100644 --- a/contracts/feature-tests/multi-contract-features/scenarios/mcf-alt-init.scen.json +++ b/contracts/feature-tests/multi-contract-features/scenarios/mcf-alt-init.scen.json @@ -18,7 +18,7 @@ "id": "alt impl deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/multi-contract-alt-impl.wasm", + "contractCode": "mxsc:../output/multi-contract-alt-impl.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-get.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-get.scen.json index 40362f1626..14f50e1c4a 100644 --- a/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-get.scen.json +++ b/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-get.scen.json @@ -23,7 +23,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/multi-contract-features.wasm", + "contractCode": "mxsc:../output/multi-contract-features.mxsc.json", "arguments": [ "123" ], @@ -43,7 +43,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/multi-contract-features-view.wasm", + "contractCode": "mxsc:../output/multi-contract-features-view.mxsc.json", "arguments": [ "sc:mcf" ], diff --git a/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json index 0d816749fa..632b0cffb4 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json @@ -26,7 +26,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/use-module.wasm", + "contractCode": "mxsc:../output/use-module.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/use-module/scenarios/use_module_features.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_features.scen.json index e18549ea0e..e58c23eb2c 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_features.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_features.scen.json @@ -22,7 +22,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/use-module.wasm", + "contractCode": "mxsc:../output/use-module.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/use-module/scenarios/use_module_internal.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_internal.scen.json index 29ce30882c..b61c3d72dc 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_internal.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_internal.scen.json @@ -22,7 +22,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/use-module.wasm", + "contractCode": "mxsc:../output/use-module.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/use-module/scenarios/use_module_only_admin.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_only_admin.scen.json index a731da0444..afa152fcb2 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_only_admin.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_only_admin.scen.json @@ -30,7 +30,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/use-module.wasm", + "contractCode": "mxsc:../output/use-module.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/use-module/scenarios/use_module_only_owner.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_only_owner.scen.json index 602a6db542..0f9c586a30 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_only_owner.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_only_owner.scen.json @@ -26,7 +26,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/use-module.wasm", + "contractCode": "mxsc:../output/use-module.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/use-module/scenarios/use_module_pause.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_pause.scen.json index 12db43f84c..c96bb34cc9 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_pause.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_pause.scen.json @@ -22,7 +22,7 @@ "id": "1", "tx": { "from": "address:owner", - "contractCode": "file:../output/use-module.wasm", + "contractCode": "mxsc:../output/use-module.mxsc.json", "arguments": [], "gasLimit": "20,000,000", "gasPrice": "0" From 9dd4e441541c47ad018f9b37dc8042044be92a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Mon, 15 May 2023 17:00:26 +0300 Subject: [PATCH 08/84] Automation script that copies files to VM --- vm-test-build-copy.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vm-test-build-copy.sh b/vm-test-build-copy.sh index 7ccd210ca0..ea1a50ecd1 100755 --- a/vm-test-build-copy.sh +++ b/vm-test-build-copy.sh @@ -14,7 +14,7 @@ build_and_copy() { sc-meta all build --target-dir $TARGET_DIR --path $contract_path || return 1 mkdir -p $vm_contract_path/output - cp $contract_path/output/*.wasm \ + cp $contract_path/output/*.mxsc.json \ $vm_contract_path/output } @@ -26,7 +26,7 @@ build_and_copy_with_scenarios() { sc-meta all build --target-dir $TARGET_DIR --path $contract_path || return 1 mkdir -p $vm_contract_path/output rm -rf $vm_contract_path/scenarios - cp $contract_path/output/*.wasm \ + cp $contract_path/output/*.mxsc.json \ $vm_contract_path/output cp -R $contract_path/scenarios \ $vm_contract_path @@ -56,8 +56,8 @@ build_and_copy_composability() { contract_with_underscores="${contract//-/_}" sc-meta all build --target-dir $TARGET_DIR --path ./contracts/feature-tests/composability/$contract || return 1 - cp -R contracts/feature-tests/composability/$contract/output/${contract}.wasm \ - $VM_REPO_PATH/test/features/composability/$contract/output/${contract}.wasm + cp -R contracts/feature-tests/composability/$contract/output/${contract}.mxsc.json \ + $VM_REPO_PATH/test/features/composability/$contract/output/${contract}.mxsc.json } build_and_copy ./contracts/feature-tests/composability/forwarder $VM_REPO_PATH/test/features/composability/forwarder From c06faa4b71f7d16db1e5ed4f78de52b5ac93bbdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Tue, 16 May 2023 08:51:33 +0300 Subject: [PATCH 09/84] sdk/scenario-format: Fixes after review --- .../src/value_interpreter/file_loader.rs | 20 ++++++++++++++----- .../src/value_interpreter/interpreter.rs | 2 +- sdk/scenario-format/tests/interpreter_test.rs | 6 +++--- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/sdk/scenario-format/src/value_interpreter/file_loader.rs b/sdk/scenario-format/src/value_interpreter/file_loader.rs index 350ca5a7d1..64d985de6f 100644 --- a/sdk/scenario-format/src/value_interpreter/file_loader.rs +++ b/sdk/scenario-format/src/value_interpreter/file_loader.rs @@ -24,11 +24,21 @@ pub fn load_file(file_path: &str, context: &InterpreterContext) -> Vec { }) } -pub fn load_mxsc_file_json(mxsc_file_path: &str) -> Vec { - let contents = fs::read_to_string(mxsc_file_path) - .unwrap_or_else(|e| panic!("not found: {} {:?}", e, mxsc_file_path)); - let mxsc_json: MxscFileJson = serde_json::from_str(contents.as_str()).unwrap(); - hex::decode(mxsc_json.code).expect("Could not decode contract code") +pub fn load_mxsc_file_json(mxsc_file_path: &str, context: &InterpreterContext) -> Vec { + match fs::read_to_string(mxsc_file_path) { + Ok(content) => { + let mxsc_json: MxscFileJson = serde_json::from_str(content.as_str()).unwrap(); + hex::decode(mxsc_json.code).expect("Could not decode contract code") + }, + Err(_) => { + if context.allow_missing_files { + let expr_str = format!("MISSING:{mxsc_file_path:?}"); + expr_str.into_bytes() + } else { + panic!("not found: {mxsc_file_path:#?}") + } + }, + } } fn missing_file_value(path_buf: &Path) -> Vec { diff --git a/sdk/scenario-format/src/value_interpreter/interpreter.rs b/sdk/scenario-format/src/value_interpreter/interpreter.rs index a55fcdd0e0..82b14a9c36 100644 --- a/sdk/scenario-format/src/value_interpreter/interpreter.rs +++ b/sdk/scenario-format/src/value_interpreter/interpreter.rs @@ -69,7 +69,7 @@ pub fn interpret_string(s: &str, context: &InterpreterContext) -> Vec { } if let Some(stripped) = s.strip_prefix(MXSC_PREFIX) { - return load_mxsc_file_json(stripped); + return load_mxsc_file_json(stripped, context); } if let Some(stripped) = s.strip_prefix(KECCAK256_PREFIX) { diff --git a/sdk/scenario-format/tests/interpreter_test.rs b/sdk/scenario-format/tests/interpreter_test.rs index d6add5c51a..2e41d0db1c 100644 --- a/sdk/scenario-format/tests/interpreter_test.rs +++ b/sdk/scenario-format/tests/interpreter_test.rs @@ -40,12 +40,12 @@ fn test_mxsc_pack() { ); } -#[should_panic] #[test] fn test_mxsc_no_pack() { - let context = &InterpreterContext::default(); + let context = &mut InterpreterContext::default().with_allowed_missing_files(); + assert_eq!( - b"not found :\"no_file.json\"".to_vec(), + b"MISSING:\"no_file.json\"".to_vec(), interpret_string("mxsc:no_file.json", context) ); } From 019f920ba3df8fddd12d7e877ff15b367aacabbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Tue, 16 May 2023 08:55:25 +0300 Subject: [PATCH 10/84] vm-test-build-copy.sh:Remove depricated wasm files --- vm-test-build-copy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vm-test-build-copy.sh b/vm-test-build-copy.sh index ea1a50ecd1..6d57de8897 100755 --- a/vm-test-build-copy.sh +++ b/vm-test-build-copy.sh @@ -16,6 +16,7 @@ build_and_copy() { mkdir -p $vm_contract_path/output cp $contract_path/output/*.mxsc.json \ $vm_contract_path/output + rm $vm_contract_path/output/*.wasm } build_and_copy_with_scenarios() { @@ -58,6 +59,7 @@ build_and_copy_composability() { sc-meta all build --target-dir $TARGET_DIR --path ./contracts/feature-tests/composability/$contract || return 1 cp -R contracts/feature-tests/composability/$contract/output/${contract}.mxsc.json \ $VM_REPO_PATH/test/features/composability/$contract/output/${contract}.mxsc.json + rm contracts/feature-tests/composability/$contract/output/*.wasm } build_and_copy ./contracts/feature-tests/composability/forwarder $VM_REPO_PATH/test/features/composability/forwarder From e5adc43cc799b8d9e66ba1d34064d5f7029124a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Tue, 16 May 2023 09:35:20 +0300 Subject: [PATCH 11/84] Fixes after review --- vm-test-build-copy.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/vm-test-build-copy.sh b/vm-test-build-copy.sh index 6d57de8897..757321a852 100755 --- a/vm-test-build-copy.sh +++ b/vm-test-build-copy.sh @@ -29,6 +29,7 @@ build_and_copy_with_scenarios() { rm -rf $vm_contract_path/scenarios cp $contract_path/output/*.mxsc.json \ $vm_contract_path/output + rm $vm_contract_path/output/*.wasm cp -R $contract_path/scenarios \ $vm_contract_path } From 5a2e4db3859b12567336311382d80c65f951765c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Tue, 16 May 2023 09:39:51 +0300 Subject: [PATCH 12/84] contracts: "file:*.wasm" -> "mxsc:*.mxsc.json" --- .../scenarios/send_tx_repeat.scen.json | 2 +- .../scenarios/unwrap_egld.scen.json | 2 +- .../wegld-swap/scenarios/wrap_egld.scen.json | 4 +- .../examples/adder/scenarios/adder.scen.json | 2 +- .../scenarios/buy.scen.json | 2 +- .../scenarios/claim.scen.json | 2 +- .../scenarios/deploy.scen.json | 2 +- .../scenarios/deposit.scen.json | 2 +- .../scenarios/deposit_more_view.scen.json | 2 +- .../scenarios/sell.scen.json | 2 +- .../scenarios/set_bonding_curve.scen.json | 2 +- .../scenarios/_generated_fund.scen.json | 4 +- .../scenarios/_generated_init.scen.json | 4 +- .../_generated_query_status.scen.json | 4 +- .../scenarios/_generated_sc_err.scen.json | 4 +- .../crowdfunding-claim-failed.scen.json | 4 +- .../crowdfunding-claim-successful.scen.json | 4 +- .../crowdfunding-fund-too-late.scen.json | 2 +- .../scenarios/crowdfunding-fund.scen.json | 2 +- .../scenarios/crowdfunding-init.scen.json | 2 +- .../egld-crowdfunding-claim-failed.scen.json | 4 +- ...ld-crowdfunding-claim-successful.scen.json | 4 +- .../egld-crowdfunding-fund-too-late.scen.json | 2 +- .../egld-crowdfunding-fund.scen.json | 2 +- .../egld-crowdfunding-init.scen.json | 2 +- .../scenarios/balanceOf.scen.json | 4 +- .../crypto-bubbles/scenarios/create.scen.json | 2 +- .../scenarios/exceptions.scen.json | 4 +- .../scenarios/joinGame.scen.json | 4 +- .../scenarios/rewardAndSendToWallet.scen.json | 4 +- .../scenarios/rewardWinner.scen.json | 4 +- .../scenarios/rewardWinner_Last.scen.json | 4 +- .../scenarios/topUp_ok.scen.json | 4 +- .../scenarios/topUp_withdraw.scen.json | 4 +- .../scenarios/withdraw_Ok.scen.json | 4 +- .../scenarios/withdraw_TooMuch.scen.json | 4 +- .../scenarios/bid_first.scen.json | 4 +- .../scenarios/bid_second_max.scen.json | 4 +- .../scenarios/bid_second_ok.scen.json | 4 +- .../scenarios/bid_second_too_low.scen.json | 4 +- .../scenarios/bid_siring_auction.scen.json | 4 +- ...reate_and_auction_gen_zero_kitty.scen.json | 4 +- .../create_sale_auction_not_owner.scen.json | 4 +- .../create_sale_auction_ok.scen.json | 4 +- .../create_siring_auction_not_owner.scen.json | 4 +- .../create_siring_auction_ok.scen.json | 4 +- .../scenarios/end_auction_no_bids.scen.json | 4 +- ...end_auction_second_bid_max_early.scen.json | 4 +- .../end_auction_second_bid_ok_early.scen.json | 4 +- .../end_auction_second_bid_ok_late.scen.json | 4 +- .../scenarios/end_siring_auction.scen.json | 4 +- .../kitty-auction/scenarios/init.scen.json | 4 +- .../scenarios/init.scen.json | 2 +- .../scenarios/approve_siring.scen.json | 2 +- .../scenarios/breed_ok.scen.json | 2 +- .../scenarios/give_birth.scen.json | 2 +- .../kitty-ownership/scenarios/init.scen.json | 2 +- .../scenarios/setup_accounts.scen.json | 2 +- .../scenarios/claim-egld.scen.json | 4 +- .../scenarios/claim-esdt.scen.json | 4 +- .../digital-cash/scenarios/forward.scen.json | 2 +- .../scenarios/fund-egld-and-esdt.scen.json | 4 +- .../scenarios/withdraw-egld.scen.json | 4 +- .../scenarios/withdraw-esdt.scen.json | 4 +- .../scenarios/claim.scen.json | 2 +- .../scenarios/deploy.scen.json | 2 +- .../setup_fees_and_transfer.scen.json | 2 +- .../factorial/scenarios/factorial.scen.json | 2 +- ...y-all-tickets-different-accounts.scen.json | 2 +- .../buy-more-tickets-than-allowed.scen.json | 2 +- .../buy-ticket-after-deadline.scen.json | 2 +- ...y-ticket-after-determined-winner.scen.json | 2 +- .../buy-ticket-after-sold-out.scen.json | 2 +- .../buy-ticket-all-options.scen.json | 2 +- .../buy-ticket-another-account.scen.json | 2 +- .../buy-ticket-not-on-whitelist.scen.json | 2 +- .../buy-ticket-same-account.scen.json | 2 +- .../buy-ticket-second-lottery.scen.json | 2 +- .../scenarios/buy-ticket-wrong-fee.scen.json | 2 +- .../scenarios/buy-ticket.scen.json | 2 +- .../complex-prize-distribution.scen.json | 4 +- ...erent-ticket-holders-winner-acc1.scen.json | 2 +- .../determine-winner-early.scen.json | 2 +- ...ermine-winner-same-ticket-holder.scen.json | 2 +- ...etermine-winner-split-prize-pool.scen.json | 2 +- .../scenarios/lottery-init.scen.json | 2 +- .../lottery-with-burn-percentage.scen.json | 8 ++-- .../start-after-announced-winner.scen.json | 2 +- ...art-all-options-bigger-whitelist.scen.json | 2 +- .../start-alternative-function-name.scen.json | 2 +- .../scenarios/start-fixed-deadline.scen.json | 2 +- ...-fixed-deadline-invalid-deadline.scen.json | 2 +- ...eadline-invalid-ticket-price-arg.scen.json | 2 +- ...mited-tickets-and-fixed-deadline.scen.json | 2 +- .../scenarios/start-limited-tickets.scen.json | 2 +- .../scenarios/start-second-lottery.scen.json | 2 +- .../start-with-all-options.scen.json | 2 +- .../scenarios/start-with-no-options.scen.json | 2 +- .../scenarios/call_other_shard-2.scen.json | 2 +- .../scenarios/deployAdder_then_call.scen.json | 2 +- .../scenarios/deployFactorial.scen.json | 4 +- .../scenarios/deployOtherMultisig.scen.json | 2 +- .../scenarios/steps/deploy.steps.json | 2 +- .../scenarios/upgrade_from_source.scen.json | 2 +- .../nft-minter/scenarios/create_nft.scen.json | 2 +- .../nft-minter/scenarios/init.scen.json | 4 +- ...ng-pong-call-ping-after-deadline.scen.json | 2 +- ...pong-call-ping-before-activation.scen.json | 2 +- ...-pong-call-ping-before-beginning.scen.json | 2 +- .../ping-pong-call-ping-second-user.scen.json | 2 +- .../ping-pong-call-ping-twice.scen.json | 2 +- ...ing-pong-call-ping-wrong-ammount.scen.json | 2 +- .../scenarios/ping-pong-call-ping.scen.json | 2 +- ...ng-pong-call-pong-all-after-pong.scen.json | 2 +- ...pong-call-pong-all-interrupted-1.scen.json | 2 +- ...pong-call-pong-all-interrupted-2.scen.json | 4 +- .../ping-pong-call-pong-all.steps.json | 2 +- ...g-pong-call-pong-before-deadline.scen.json | 2 +- .../ping-pong-call-pong-twice.scen.json | 2 +- ...ping-pong-call-pong-without-ping.scen.json | 2 +- .../scenarios/ping-pong-call-pong.scen.json | 2 +- .../scenarios/ping-pong-init.scen.json | 2 +- .../proxy-pause/scenarios/init.scen.json | 2 +- .../scenarios/test-add-group.scen.json | 2 +- .../scenarios/test-add-user.scen.json | 2 +- .../scenarios/test-change-user.scen.json | 2 +- .../scenarios/test-claim.scen.json | 2 +- .../scenarios/test-end-setup.scen.json | 2 +- .../scenarios/test-init.scen.json | 4 +- .../scenarios/boxed_bytes_zeros.scen.json | 2 +- .../crypto_elliptic_curves_legacy.scen.json | 2 +- .../crypto_keccak256_legacy_alloc.scen.json | 2 +- .../crypto_ripemd160_legacy.scen.json | 2 +- .../crypto_sha256_legacy_alloc.scen.json | 2 +- .../crypto_verify_bls_legacy.scen.json | 2 +- .../crypto_verify_ed25519_legacy.scen.json | 2 +- .../crypto_verify_secp256k1_legacy.scen.json | 2 +- .../echo_async_result_empty.scen.json | 2 +- .../echo_big_int_nested_alloc.scen.json | 4 +- .../scenarios/echo_boxed_bytes.scen.json | 4 +- .../echo_multi_value_tuples_alloc.scen.json | 2 +- .../scenarios/echo_ser_ex_1.scen.json | 2 +- .../scenarios/echo_slice_u8.scen.json | 4 +- .../scenarios/echo_str.scen.json | 2 +- .../scenarios/echo_str_box.scen.json | 2 +- .../scenarios/echo_string.scen.json | 2 +- .../echo_varargs_u32_alloc.scen.json | 2 +- .../scenarios/echo_vec_u8.scen.json | 4 +- .../scenarios/events_legacy.scen.json | 2 +- .../managed_buffer_concat_2.scen.json | 2 +- .../managed_buffer_load_slice.scen.json | 2 +- .../managed_buffer_overwrite.scen.json | 2 +- .../managed_buffer_set_slice.scen.json | 2 +- .../scenarios/only_owner_legacy.scen.json | 4 +- .../scenarios/sc_result.scen.json | 2 +- .../scenarios/storage_address.scen.json | 4 +- .../scenarios/storage_opt_address.scen.json | 6 +-- .../scenarios/storage_vec_u8.scen.json | 6 +-- .../scenarios/big_int_from_i64.scen.json | 2 +- .../scenarios/big_int_to_i64.scen.json | 2 +- .../scenarios/big_num_conversions.scen.json | 2 +- .../scenarios/big_uint_eq_u64.scen.json | 2 +- .../scenarios/big_uint_from_u64.scen.json | 2 +- .../scenarios/big_uint_log2.json | 2 +- .../scenarios/big_uint_pow.json | 2 +- .../scenarios/big_uint_sqrt.scen.json | 2 +- .../scenarios/big_uint_to_u64.scen.json | 2 +- .../scenarios/block_info.scen.json | 2 +- .../scenarios/codec_err.scen.json | 2 +- .../scenarios/count_ones.scen.json | 2 +- .../crypto_elliptic_curves.scen.json | 2 +- .../scenarios/crypto_keccak256.scen.json | 2 +- .../crypto_keccak256_legacy_managed.scen.json | 2 +- .../scenarios/crypto_ripemd160.scen.json | 2 +- .../scenarios/crypto_sha256.scen.json | 2 +- .../crypto_sha256_legacy_managed.scen.json | 2 +- .../scenarios/crypto_verify_bls.scen.json | 2 +- .../scenarios/crypto_verify_ed25519.scen.json | 2 +- .../crypto_verify_secp256k1.scen.json | 2 +- .../scenarios/echo_array_u8.scen.json | 4 +- .../scenarios/echo_arrayvec.scen.json | 2 +- .../scenarios/echo_big_int_nested.scen.json | 4 +- .../scenarios/echo_big_int_top.scen.json | 4 +- .../scenarios/echo_big_uint.scen.json | 4 +- .../scenarios/echo_i32.scen.json | 4 +- .../scenarios/echo_i64.scen.json | 4 +- .../scenarios/echo_ignore.scen.json | 2 +- .../echo_managed_async_result_empty.scen.json | 2 +- .../scenarios/echo_managed_bytes.scen.json | 2 +- .../scenarios/echo_managed_vec.scen.json | 2 +- .../echo_multi_value_tuples.scen.json | 2 +- .../scenarios/echo_nothing.scen.json | 2 +- .../echo_tuple_into_multiresult.scen.json | 2 +- .../scenarios/echo_u64.scen.json | 4 +- .../scenarios/echo_usize.scen.json | 4 +- .../echo_varargs_managed_eager.scen.json | 2 +- .../echo_varargs_managed_sum.scen.json | 2 +- .../scenarios/echo_varargs_u32.scen.json | 2 +- .../basic-features/scenarios/events.scen.json | 2 +- .../scenarios/get_caller.scen.json | 2 +- .../get_cumulated_validator_rewards.scen.json | 2 +- .../scenarios/managed_address_array.scen.json | 2 +- .../managed_address_managed_buffer.scen.json | 2 +- .../scenarios/managed_buffer_concat.scen.json | 2 +- .../managed_buffer_copy_slice.scen.json | 2 +- .../scenarios/managed_buffer_eq.scen.json | 2 +- .../managed_buffer_set_random.scen.json | 2 +- .../managed_vec_address_push.scen.json | 2 +- .../managed_vec_array_push.scen.json | 2 +- .../managed_vec_biguint_push.scen.json | 2 +- .../scenarios/only_owner.scen.json | 4 +- .../scenarios/only_user_account.scen.json | 4 +- .../scenarios/out_of_gas.scen.json | 2 +- .../basic-features/scenarios/panic.scen.json | 4 +- .../scenarios/return_codes.scen.json | 2 +- .../scenarios/sc_properties.scen.json | 6 +-- .../scenarios/storage_big_int.scen.json | 6 +-- .../scenarios/storage_big_uint.scen.json | 6 +-- .../scenarios/storage_bool.scen.json | 6 +-- .../scenarios/storage_clear.scen.json | 4 +- .../scenarios/storage_i64.scen.json | 6 +-- .../scenarios/storage_i64_bad.scen.json | 2 +- .../storage_load_from_address.scen.json | 4 +- .../storage_managed_address.scen.json | 4 +- .../scenarios/storage_map1.scen.json | 6 +-- .../scenarios/storage_map2.scen.json | 6 +-- .../scenarios/storage_map3.scen.json | 6 +-- .../storage_mapper_fungible_token.scen.json | 40 +++++++++---------- .../storage_mapper_linked_list.scen.json | 12 +++--- .../scenarios/storage_mapper_map.scen.json | 24 +++++------ .../storage_mapper_map_storage.scen.json | 20 +++++----- ...torage_mapper_non_fungible_token.scen.json | 12 +++--- .../scenarios/storage_mapper_queue.scen.json | 10 ++--- .../scenarios/storage_mapper_set.scen.json | 10 ++--- .../storage_mapper_single_value.scen.json | 20 +++++----- .../storage_mapper_token_attributes.scen.json | 8 ++-- .../storage_mapper_unique_id.scen.json | 8 ++-- .../scenarios/storage_mapper_vec.scen.json | 8 ++-- .../storage_mapper_whitelist.scen.json | 16 ++++---- .../storage_opt_managed_addr.scen.json | 6 +-- .../storage_raw_api_features.scen.json | 6 +-- .../scenarios/storage_reserved.scen.json | 2 +- .../scenarios/storage_u64.scen.json | 6 +-- .../scenarios/storage_u64_bad.scen.json | 2 +- .../scenarios/storage_usize.scen.json | 6 +-- .../scenarios/storage_usize_bad.scen.json | 2 +- .../scenarios/struct_eq.scen.json | 2 +- .../big_float_new_from_big_int.scen.json | 2 +- .../big_float_new_from_big_uint.scen.json | 2 +- .../big_float_new_from_frac.scen.json | 2 +- .../big_float_new_from_int.scen.json | 2 +- ...ig_float_new_from_managed_buffer.scen.json | 2 +- .../big_float_new_from_parts.scen.json | 2 +- .../big_float_new_from_sci.scen.json | 2 +- .../big_float_operator_checks.scen.json | 2 +- .../scenarios/big_float_operators.scen.json | 2 +- .../promises_call_async_accept_egld.scen.json | 8 ++-- .../promises_call_async_accept_esdt.scen.json | 8 ++-- ...romises_call_async_retrieve_egld.scen.json | 8 ++-- ...romises_call_async_retrieve_esdt.scen.json | 8 ++-- .../promises_call_callback_directly.scen.json | 2 +- .../promises_multi_transfer.scen.json | 8 ++-- .../promises_single_transfer.scen.json | 16 ++++---- .../promises_single_transfer_gas1.scen.json | 8 ++-- .../promises_single_transfer_gas2.scen.json | 4 +- .../recursive_caller_egld_2.scen.json | 8 ++-- .../recursive_caller_egld_x.scen.json | 8 ++-- .../recursive_caller_esdt_2.scen.json | 8 ++-- .../recursive_caller_esdt_x.scen.json | 8 ++-- .../scenarios/forw_queue_async.scen.json | 8 ++-- .../forw_raw_async_accept_egld.scen.json | 8 ++-- .../forw_raw_async_accept_esdt.scen.json | 8 ++-- .../scenarios/forw_raw_async_echo.scen.json | 8 ++-- ...nd_retrieve_multi_transfer_funds.scen.json | 8 ++-- ...in_nft_local_mint_via_async_call.scen.json | 4 +- ...tin_nft_local_mint_via_sync_call.scen.json | 4 +- ...ll_async_retrieve_multi_transfer.scen.json | 8 ++-- .../forw_raw_contract_deploy.scen.json | 8 ++-- .../forw_raw_contract_upgrade.scen.json | 8 ++-- .../forw_raw_contract_upgrade_self.scen.json | 8 ++-- .../scenarios/forw_raw_direct_egld.scen.json | 8 ++-- .../scenarios/forw_raw_direct_esdt.scen.json | 8 ++-- .../forw_raw_direct_multi_esdt.scen.json | 4 +- .../scenarios/forw_raw_init_async.scen.json | 2 +- .../forw_raw_init_sync_accept_egld.scen.json | 2 +- .../forw_raw_init_sync_echo.scen.json | 2 +- .../scenarios/forw_raw_sync_echo.scen.json | 4 +- .../forw_raw_sync_echo_caller.scen.json | 4 +- .../scenarios/forw_raw_sync_egld.scen.json | 4 +- .../forw_raw_sync_readonly.scen.json | 8 ++-- .../forw_raw_sync_same_context.scen.json | 8 ++-- .../forw_raw_sync_same_context_egld.scen.json | 8 ++-- ...forw_raw_transf_exec_accept_egld.scen.json | 12 +++--- ...forw_raw_transf_exec_reject_egld.scen.json | 4 +- ...rwarder_builtin_nft_add_quantity.scen.json | 8 ++-- .../forwarder_builtin_nft_burn.scen.json | 8 ++-- .../forwarder_builtin_nft_create.scen.json | 8 ++-- ...forwarder_builtin_nft_local_burn.scen.json | 8 ++-- ...forwarder_builtin_nft_local_mint.scen.json | 8 ++-- ...forwarder_call_async_accept_egld.scen.json | 8 ++-- ...forwarder_call_async_accept_esdt.scen.json | 8 ++-- .../forwarder_call_async_accept_nft.scen.json | 8 ++-- ...warder_call_async_multi_transfer.scen.json | 12 +++--- ...rwarder_call_async_retrieve_egld.scen.json | 8 ++-- ...rwarder_call_async_retrieve_esdt.scen.json | 8 ++-- ...orwarder_call_async_retrieve_nft.scen.json | 8 ++-- .../forwarder_call_sync_accept_egld.scen.json | 8 ++-- .../forwarder_call_sync_accept_esdt.scen.json | 8 ++-- ..._call_sync_accept_multi_transfer.scen.json | 8 ++-- .../forwarder_call_sync_accept_nft.scen.json | 8 ++-- ..._call_sync_accept_then_read_egld.scen.json | 8 ++-- ..._call_sync_accept_then_read_esdt.scen.json | 8 ++-- ...r_call_sync_accept_then_read_nft.scen.json | 8 ++-- ...orwarder_call_sync_retrieve_egld.scen.json | 8 ++-- ...orwarder_call_sync_retrieve_esdt.scen.json | 8 ++-- ...forwarder_call_sync_retrieve_nft.scen.json | 8 ++-- ...der_call_transf_exec_accept_egld.scen.json | 8 ++-- ...ll_transf_exec_accept_egld_twice.scen.json | 8 ++-- ...der_call_transf_exec_accept_esdt.scen.json | 8 ++-- ...ll_transf_exec_accept_esdt_twice.scen.json | 8 ++-- ...ransf_exec_accept_multi_transfer.scen.json | 12 +++--- ...rder_call_transf_exec_accept_nft.scen.json | 8 ++-- ...transf_exec_accept_return_values.scen.json | 8 ++-- ...all_transf_exec_accept_sft_twice.scen.json | 8 ++-- ...ransf_exec_reject_multi_transfer.scen.json | 8 ++-- ...rder_call_transf_exec_reject_nft.scen.json | 4 +- .../forwarder_contract_change_owner.scen.json | 6 +-- .../forwarder_contract_deploy.scen.json | 12 +++--- .../forwarder_contract_upgrade.scen.json | 8 ++-- .../forwarder_get_esdt_local_roles.scen.json | 8 ++-- .../forwarder_get_esdt_token_data.scen.json | 2 +- .../scenarios/forwarder_nft_add_uri.scen.json | 6 +-- .../scenarios/forwarder_nft_create.scen.json | 4 +- .../forwarder_nft_create_and_send.scen.json | 4 +- .../forwarder_nft_current_nonce.scen.json | 2 +- ...er_nft_decode_complex_attributes.scen.json | 4 +- .../forwarder_nft_transfer_async.scen.json | 4 +- .../forwarder_nft_transfer_exec.scen.json | 4 +- .../forwarder_nft_update_attributes.scen.json | 6 +-- .../scenarios/forwarder_no_endpoint.scen.json | 2 +- ..._retrieve_funds_with_accept_func.scen.json | 8 ++-- ...rwarder_send_esdt_multi_transfer.scen.json | 6 +-- .../forwarder_send_twice_egld.scen.json | 8 ++-- .../forwarder_send_twice_esdt.scen.json | 8 ++-- .../scenarios/forwarder_sync_echo.scen.json | 4 +- ...forwarder_tranfer_esdt_with_fees.scen.json | 20 +++++----- ...warder_validate_token_identifier.scen.json | 2 +- .../scenarios/proxy_test_init.scen.json | 6 +-- .../proxy_test_message_otherShard.scen.json | 4 +- ...test_message_otherShard_callback.scen.json | 4 +- .../proxy_test_message_sameShard.scen.json | 8 ++-- ..._test_message_sameShard_callback.scen.json | 8 ++-- .../proxy_test_payment_otherShard.scen.json | 4 +- ...test_payment_otherShard_callback.scen.json | 4 +- .../proxy_test_payment_sameShard.scen.json | 8 ++-- ..._test_payment_sameShard_callback.scen.json | 8 ++-- .../scenarios/proxy_test_upgrade.scen.json | 4 +- .../recursive_caller_egld_1.scen.json | 8 ++-- .../recursive_caller_esdt_1.scen.json | 8 ++-- .../scenarios/send_egld.scen.json | 4 +- .../scenarios/send_esdt.scen.json | 4 +- .../deploy_erc20_and_crowdfunding.scen.json | 6 +-- ...fund_with_insufficient_allowance.scen.json | 4 +- .../fund_with_sufficient_allowance.scen.json | 8 ++-- .../fund_without_allowance.scen.json | 4 +- .../scenarios/set_accounts.step.json | 4 +- .../scenarios/auction_batch.scen.json | 4 +- .../auction_single_token_egld.scen.json | 4 +- .../scenarios/bid_first_egld.scen.json | 4 +- .../scenarios/bid_second_egld.scen.json | 4 +- .../scenarios/bid_third_egld.scen.json | 4 +- .../scenarios/end_auction.scen.json | 4 +- .../scenarios/setup_accounts.step.json | 4 +- .../batch_transfer_both_types.scen.json | 2 +- .../batch_transfer_both_types_to_sc.scen.json | 6 +-- .../batch_transfer_fungible.scen.json | 2 +- .../batch_transfer_fungible_to_sc.scen.json | 6 +-- .../batch_transfer_non_fungible.scen.json | 2 +- ...atch_transfer_non_fungible_to_sc.scen.json | 6 +-- .../erc1155/scenarios/burn_fungible.scen.json | 2 +- .../scenarios/burn_non_fungible.scen.json | 2 +- ...te_one_fungible_one_non_fungible.scen.json | 2 +- .../scenarios/create_token_fungible.scen.json | 2 +- .../create_token_non_fungible.scen.json | 2 +- ..._both_fungible_different_creator.scen.json | 2 +- ...okens_both_fungible_same_creator.scen.json | 2 +- ...s_both_non_fungible_same_creator.scen.json | 2 +- .../erc1155/scenarios/deploy.scen.json | 2 +- .../erc1155/scenarios/mint_fungible.scen.json | 2 +- .../scenarios/mint_non_fungible.scen.json | 2 +- .../scenarios/mint_not_creator.scen.json | 2 +- ...sfer_fungible_not_enough_balance.scen.json | 2 +- .../scenarios/transfer_fungible_ok.scen.json | 2 +- .../transfer_fungible_ok_to_sc.scen.json | 6 +-- .../transfer_non_fungible_ok.scen.json | 2 +- .../transfer_non_fungible_ok_to_sc.scen.json | 6 +-- .../allowance_CallerCaller.scen.json | 2 +- .../scenarios/allowance_CallerOther.scen.json | 2 +- .../scenarios/allowance_OtherCaller.scen.json | 2 +- .../allowance_OtherEqOther.scen.json | 2 +- .../allowance_OtherNEqOther.scen.json | 2 +- .../approve_Caller-Positive.scen.json | 4 +- .../scenarios/approve_Caller-Zero.scen.json | 4 +- .../approve_Other-Positive.scen.json | 4 +- .../scenarios/approve_Other-Zero.scen.json | 4 +- .../scenarios/approve_SwitchCaller.scen.json | 4 +- .../scenarios/balanceOf_Caller.scen.json | 4 +- .../scenarios/balanceOf_NonCaller.scen.json | 4 +- .../erc20/scenarios/not_payable.scen.json | 4 +- .../scenarios/not_payable_esdt.scen.json | 4 +- .../scenarios/totalSupply_Positive.scen.json | 4 +- .../scenarios/totalSupply_Zero.scen.json | 4 +- ...m_AllDistinct-BalanceEqAllowance.scen.json | 4 +- ..._AllDistinct-BalanceNEqAllowance.scen.json | 4 +- ...t-EntireAllowanceMoreThanBalance.scen.json | 4 +- ...istinct-EntireBalanceEqAllowance.scen.json | 4 +- ...t-EntireBalanceMoreThanAllowance.scen.json | 4 +- ...MoreThanAllowanceLessThanBalance.scen.json | 4 +- ...MoreThanBalanceLessThanAllowance.scen.json | 4 +- ...nsferFrom_AllDistinct-NoOverflow.scen.json | 4 +- ...From_AllDistinct-StillNoOverflow.scen.json | 4 +- ...rFrom_AllEqual-AllowanceRelevant.scen.json | 4 +- ...nsferFrom_AllEqual-EntireBalance.scen.json | 4 +- ...m_CallerEqFrom-AllowanceRelevant.scen.json | 4 +- ...rFrom_CallerEqFrom-EntireBalance.scen.json | 4 +- ...rom_CallerEqFrom-MoreThanBalance.scen.json | 4 +- ...m_CallerEqTo-BalanceNEqAllowance.scen.json | 4 +- ...MoreThanAllowanceLessThanBalance.scen.json | 4 +- ...MoreThanBalanceLessThanAllowance.scen.json | 4 +- ...oratory-MultipleTransfersSucceed.scen.json | 4 +- ...ploratory-MultipleTransfersThrow.scen.json | 4 +- ...From_FromEqTo-BalanceEqAllowance.scen.json | 4 +- ...rom_FromEqTo-BalanceNEqAllowance.scen.json | 4 +- ...o-EntireAllowanceMoreThanBalance.scen.json | 4 +- ...romEqTo-EntireBalanceEqAllowance.scen.json | 4 +- ...o-EntireBalanceMoreThanAllowance.scen.json | 4 +- ...MoreThanAllowanceLessThanBalance.scen.json | 4 +- ...MoreThanBalanceLessThanAllowance.scen.json | 4 +- ...transferFrom_FromEqTo-NoOverflow.scen.json | 4 +- ...nsfer_Caller-AllowanceIrrelevant.scen.json | 4 +- .../transfer_Caller-EntireBalance.scen.json | 4 +- .../transfer_Caller-MoreThanBalance.scen.json | 4 +- .../transfer_Caller-NoOverflow.scen.json | 4 +- .../transfer_Caller-Positive.scen.json | 4 +- .../transfer_Caller-StillNoOverflow.scen.json | 4 +- .../scenarios/transfer_Caller-Zero.scen.json | 4 +- ...ansfer_Other-AllowanceIrrelevant.scen.json | 4 +- .../transfer_Other-EntireBalance.scen.json | 4 +- .../transfer_Other-MoreThanBalance.scen.json | 4 +- .../transfer_Other-NoOverflow.scen.json | 4 +- .../transfer_Other-Positive.scen.json | 4 +- .../transfer_Other-StillNoOverflow.scen.json | 4 +- .../scenarios/transfer_Other-Zero.scen.json | 4 +- ...y-all-tickets-different-accounts.scen.json | 4 +- .../buy-more-tickets-than-allowed.scen.json | 4 +- .../buy-ticket-after-deadline.scen.json | 4 +- ...y-ticket-after-determined-winner.scen.json | 4 +- .../buy-ticket-after-sold-out.scen.json | 4 +- .../buy-ticket-all-options.scen.json | 4 +- .../buy-ticket-another-account.scen.json | 4 +- .../buy-ticket-not-on-whitelist.scen.json | 4 +- .../buy-ticket-same-account.scen.json | 6 +-- .../buy-ticket-second-lottery.scen.json | 6 +-- .../scenarios/buy-ticket-wrong-fee.scen.json | 4 +- .../scenarios/buy-ticket.scen.json | 4 +- ...erent-ticket-holders-winner-acc1.scen.json | 4 +- .../determine-winner-early.scen.json | 4 +- ...ermine-winner-same-ticket-holder.scen.json | 4 +- ...etermine-winner-split-prize-pool.scen.json | 4 +- .../scenarios/lottery-init.scen.json | 6 +-- .../scenarios/set_accounts.step.json | 2 +- .../start-after-announced-winner.scen.json | 4 +- ...art-all-options-bigger-whitelist.scen.json | 6 +-- .../start-alternative-function-name.scen.json | 4 +- .../scenarios/start-fixed-deadline.scen.json | 4 +- ...-fixed-deadline-invalid-deadline.scen.json | 4 +- ...eadline-invalid-ticket-price-arg.scen.json | 4 +- ...mited-tickets-and-fixed-deadline.scen.json | 4 +- .../scenarios/start-limited-tickets.scen.json | 4 +- .../scenarios/start-second-lottery.scen.json | 4 +- .../start-with-all-options.scen.json | 4 +- .../scenarios/start-with-no-options.scen.json | 4 +- .../scenarios/esdt_system_sc.scen.json | 4 +- .../scenarios/managed_error_message.scen.json | 2 +- .../scenarios/sc_format.scen.json | 2 +- .../scenarios/balanceOf.scen.json | 4 +- .../scenarios/create.scen.json | 2 +- .../scenarios/exceptions.scen.json | 4 +- .../scenarios/joinGame.scen.json | 4 +- .../scenarios/rewardAndSendToWallet.scen.json | 4 +- .../scenarios/rewardWinner.scen.json | 4 +- .../scenarios/rewardWinner_Last.scen.json | 4 +- .../scenarios/topUp_ok.scen.json | 4 +- .../scenarios/topUp_withdraw.scen.json | 4 +- .../scenarios/withdraw_Ok.scen.json | 4 +- .../scenarios/withdraw_TooMuch.scen.json | 4 +- .../scenarios/mmap_get.scen.json | 2 +- .../scenarios/mmap_remove.scen.json | 2 +- .../scenarios/mcf-example-feature.scen.json | 4 +- .../scenarios/mcf-external-get.scen.json | 8 ++-- .../scenarios/mcf-external-pure.scen.json | 4 +- .../scenarios/panic-message.scen.json | 4 +- .../scenarios/call-value-check.scen.json | 2 +- .../scenarios/payable_any_1.scen.json | 2 +- .../scenarios/payable_any_2.scen.json | 2 +- .../scenarios/payable_any_3.scen.json | 2 +- .../scenarios/payable_any_4.scen.json | 2 +- .../scenarios/payable_egld_1.scen.json | 2 +- .../scenarios/payable_egld_2.scen.json | 2 +- .../scenarios/payable_egld_3.scen.json | 2 +- .../scenarios/payable_egld_4.scen.json | 2 +- .../scenarios/payable_multi_array.scen.json | 2 +- .../scenarios/payable_multiple.scen.json | 2 +- .../scenarios/payable_token_1.scen.json | 2 +- .../scenarios/payable_token_2.scen.json | 2 +- .../scenarios/payable_token_3.scen.json | 2 +- .../scenarios/payable_token_4.scen.json | 2 +- .../scenarios/test.scen.json | 4 +- .../scenarios/test_esdt_generation.scen.json | 4 +- .../scenarios/test_multiple_sc.scen.json | 4 +- ...e_module_claim_developer_rewards.scen.json | 10 ++--- .../use_module_dns_register.scen.json | 4 +- .../use_module_no_endpoint.scen.json | 2 +- ...module_ongoing_operation_example.scen.json | 8 ++-- 524 files changed, 1099 insertions(+), 1099 deletions(-) diff --git a/contracts/benchmarks/send-tx-repeat/scenarios/send_tx_repeat.scen.json b/contracts/benchmarks/send-tx-repeat/scenarios/send_tx_repeat.scen.json index 4bbb0339ac..d8ad2b1785 100644 --- a/contracts/benchmarks/send-tx-repeat/scenarios/send_tx_repeat.scen.json +++ b/contracts/benchmarks/send-tx-repeat/scenarios/send_tx_repeat.scen.json @@ -82,7 +82,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/send-tx-repeat.wasm" + "code": "mxsc:../output/send-tx-repeat.mxsc.json" } } } diff --git a/contracts/core/wegld-swap/scenarios/unwrap_egld.scen.json b/contracts/core/wegld-swap/scenarios/unwrap_egld.scen.json index 6adf64d201..70bc39b26d 100644 --- a/contracts/core/wegld-swap/scenarios/unwrap_egld.scen.json +++ b/contracts/core/wegld-swap/scenarios/unwrap_egld.scen.json @@ -62,7 +62,7 @@ "storage": { "str:wrappedEgldTokenId": "str:EGLD-abcdef" }, - "code": "file:../output/multiversx-wegld-swap-sc.wasm" + "code": "mxsc:../output/multiversx-wegld-swap-sc.mxsc.json" } } } diff --git a/contracts/core/wegld-swap/scenarios/wrap_egld.scen.json b/contracts/core/wegld-swap/scenarios/wrap_egld.scen.json index 2fca296af1..d9f3eddfc1 100644 --- a/contracts/core/wegld-swap/scenarios/wrap_egld.scen.json +++ b/contracts/core/wegld-swap/scenarios/wrap_egld.scen.json @@ -29,7 +29,7 @@ "storage": { "str:wrappedEgldTokenId": "str:EGLD-abcdef" }, - "code": "file:../output/multiversx-wegld-swap-sc.wasm" + "code": "mxsc:../output/multiversx-wegld-swap-sc.mxsc.json" } } }, @@ -86,7 +86,7 @@ "storage": { "str:wrappedEgldTokenId": "str:EGLD-abcdef" }, - "code": "file:../output/multiversx-wegld-swap-sc.wasm" + "code": "mxsc:../output/multiversx-wegld-swap-sc.mxsc.json" } } } diff --git a/contracts/examples/adder/scenarios/adder.scen.json b/contracts/examples/adder/scenarios/adder.scen.json index 79fe76e578..6e8531af08 100644 --- a/contracts/examples/adder/scenarios/adder.scen.json +++ b/contracts/examples/adder/scenarios/adder.scen.json @@ -91,7 +91,7 @@ "storage": { "str:sum": "8" }, - "code": "file:../output/adder.wasm" + "code": "mxsc:../output/adder.mxsc.json" } } } diff --git a/contracts/examples/bonding-curve-contract/scenarios/buy.scen.json b/contracts/examples/bonding-curve-contract/scenarios/buy.scen.json index bfc8467305..10a48ef194 100644 --- a/contracts/examples/bonding-curve-contract/scenarios/buy.scen.json +++ b/contracts/examples/bonding-curve-contract/scenarios/buy.scen.json @@ -266,7 +266,7 @@ "str:owned_tokens|address:artist2|str:.node_id|nested:str:MFSFT-246802": "1", "str:owned_tokens|address:artist2|str:.value|u32:1": "str:MFSFT-246802" }, - "code": "file:../output/bonding-curve-contract.wasm" + "code": "mxsc:../output/bonding-curve-contract.mxsc.json" } } } diff --git a/contracts/examples/bonding-curve-contract/scenarios/claim.scen.json b/contracts/examples/bonding-curve-contract/scenarios/claim.scen.json index 64a3c21721..7fa50cf4ab 100644 --- a/contracts/examples/bonding-curve-contract/scenarios/claim.scen.json +++ b/contracts/examples/bonding-curve-contract/scenarios/claim.scen.json @@ -173,7 +173,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/bonding-curve-contract.wasm" + "code": "mxsc:../output/bonding-curve-contract.mxsc.json" } } } diff --git a/contracts/examples/bonding-curve-contract/scenarios/deploy.scen.json b/contracts/examples/bonding-curve-contract/scenarios/deploy.scen.json index ec9af18cc5..165c67889c 100644 --- a/contracts/examples/bonding-curve-contract/scenarios/deploy.scen.json +++ b/contracts/examples/bonding-curve-contract/scenarios/deploy.scen.json @@ -212,7 +212,7 @@ "sc:bonding-curve-contract": { "nonce": "0", "balance": "0", - "code": "file:../output/bonding-curve-contract.wasm" + "code": "mxsc:../output/bonding-curve-contract.mxsc.json" } } } diff --git a/contracts/examples/bonding-curve-contract/scenarios/deposit.scen.json b/contracts/examples/bonding-curve-contract/scenarios/deposit.scen.json index 3d9affc8f6..15fb02032f 100644 --- a/contracts/examples/bonding-curve-contract/scenarios/deposit.scen.json +++ b/contracts/examples/bonding-curve-contract/scenarios/deposit.scen.json @@ -437,7 +437,7 @@ "str:owned_tokens|address:artist2|str:.node_id|nested:str:MFSFT-246802": "1", "str:owned_tokens|address:artist2|str:.value|u32:1": "str:MFSFT-246802" }, - "code": "file:../output/bonding-curve-contract.wasm" + "code": "mxsc:../output/bonding-curve-contract.mxsc.json" } } } diff --git a/contracts/examples/bonding-curve-contract/scenarios/deposit_more_view.scen.json b/contracts/examples/bonding-curve-contract/scenarios/deposit_more_view.scen.json index 1fe5b3028a..f63833ccd5 100644 --- a/contracts/examples/bonding-curve-contract/scenarios/deposit_more_view.scen.json +++ b/contracts/examples/bonding-curve-contract/scenarios/deposit_more_view.scen.json @@ -187,7 +187,7 @@ "str:owned_tokens|address:artist2|str:.node_id|nested:str:MFSFT-246802": "1", "str:owned_tokens|address:artist2|str:.value|u32:1": "str:MFSFT-246802" }, - "code": "file:../output/bonding-curve-contract.wasm" + "code": "mxsc:../output/bonding-curve-contract.mxsc.json" } } }, diff --git a/contracts/examples/bonding-curve-contract/scenarios/sell.scen.json b/contracts/examples/bonding-curve-contract/scenarios/sell.scen.json index 0e845a950e..5d46d9fdef 100644 --- a/contracts/examples/bonding-curve-contract/scenarios/sell.scen.json +++ b/contracts/examples/bonding-curve-contract/scenarios/sell.scen.json @@ -210,7 +210,7 @@ "str:owned_tokens|address:artist2|str:.node_id|nested:str:MFSFT-246802": "1", "str:owned_tokens|address:artist2|str:.value|u32:1": "str:MFSFT-246802" }, - "code": "file:../output/bonding-curve-contract.wasm" + "code": "mxsc:../output/bonding-curve-contract.mxsc.json" } } } diff --git a/contracts/examples/bonding-curve-contract/scenarios/set_bonding_curve.scen.json b/contracts/examples/bonding-curve-contract/scenarios/set_bonding_curve.scen.json index bc3f43f8c7..72606bab3e 100644 --- a/contracts/examples/bonding-curve-contract/scenarios/set_bonding_curve.scen.json +++ b/contracts/examples/bonding-curve-contract/scenarios/set_bonding_curve.scen.json @@ -236,7 +236,7 @@ "str:owned_tokens|address:artist2|str:.node_id|nested:str:MFSFT-246802": "1", "str:owned_tokens|address:artist2|str:.value|u32:1": "str:MFSFT-246802" }, - "code": "file:../output/bonding-curve-contract.wasm" + "code": "mxsc:../output/bonding-curve-contract.mxsc.json" } } } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json index 1b5c66f722..859ca77bab 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json @@ -36,7 +36,7 @@ "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": { "nonce": "0", "balance": "0", - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } @@ -97,7 +97,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json index eb5955ef8e..9a1b954595 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json @@ -36,7 +36,7 @@ "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": { "nonce": "0", "balance": "0", - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } @@ -97,7 +97,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json index e9b6c6347f..af9f55de97 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json @@ -36,7 +36,7 @@ "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": { "nonce": "0", "balance": "0", - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } @@ -97,7 +97,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json index 0f6a62f828..ac77ab6de9 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json @@ -36,7 +36,7 @@ "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": { "nonce": "0", "balance": "0", - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } @@ -97,7 +97,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-failed.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-failed.scen.json index 81472c075d..be377a774b 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-failed.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-failed.scen.json @@ -79,7 +79,7 @@ "str:deposit|address:donor1": "250,000,000,000", "str:deposit|address:donor2": "200,000,000,000" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } }, @@ -188,7 +188,7 @@ "str:deposit|address:donor1": "0", "str:deposit|address:donor2": "0" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-successful.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-successful.scen.json index 9d56c80a08..98b28e417e 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-successful.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-claim-successful.scen.json @@ -78,7 +78,7 @@ "str:deposit|address:donor1": "250,000,000,000", "str:deposit|address:donor2": "250,000,000,000" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } }, @@ -178,7 +178,7 @@ "str:deposit|address:donor1": "250,000,000,000", "str:deposit|address:donor2": "250,000,000,000" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-fund-too-late.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-fund-too-late.scen.json index 8f81de1359..1320619c8a 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-fund-too-late.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-fund-too-late.scen.json @@ -64,7 +64,7 @@ "str:tokenIdentifier": "str:CROWD-123456", "str:deposit|address:donor1": "250,000,000,000" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } }, diff --git a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-fund.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-fund.scen.json index ee01c19883..2a4a348f54 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-fund.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-fund.scen.json @@ -69,7 +69,7 @@ "str:tokenIdentifier": "str:CROWD-123456", "str:deposit|address:donor1": "250,000,000,000" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-init.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-init.scen.json index 8ad105d802..06ac6cf637 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-init.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/crowdfunding-init.scen.json @@ -54,7 +54,7 @@ "str:deadline": "123,000", "str:tokenIdentifier": "str:CROWD-123456" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-failed.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-failed.scen.json index eaab2ea110..be2df15dcd 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-failed.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-failed.scen.json @@ -61,7 +61,7 @@ "str:deposit|address:donor1": "250,000,000,000", "str:deposit|address:donor2": "200,000,000,000" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } }, @@ -135,7 +135,7 @@ "str:deposit|address:donor1": "0", "str:deposit|address:donor2": "0" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-successful.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-successful.scen.json index 398aa58de9..4d911a34dc 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-successful.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-claim-successful.scen.json @@ -61,7 +61,7 @@ "str:deposit|address:donor1": "250,000,000,000", "str:deposit|address:donor2": "250,000,000,000" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } }, @@ -136,7 +136,7 @@ "str:deposit|address:donor1": "250,000,000,000", "str:deposit|address:donor2": "250,000,000,000" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund-too-late.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund-too-late.scen.json index 8cbb37c69d..021c8ebaa6 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund-too-late.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund-too-late.scen.json @@ -53,7 +53,7 @@ "str:tokenIdentifier": "str:EGLD", "str:deposit|address:donor1": "250,000,000,000" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } }, diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund.scen.json index 17985d48d8..207b282c5f 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-fund.scen.json @@ -55,7 +55,7 @@ "str:tokenIdentifier": "str:EGLD", "str:deposit|address:donor1": "250,000,000,000" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json index 533e8abe19..2093f48371 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/egld-crowdfunding-init.scen.json @@ -54,7 +54,7 @@ "str:deadline": "123,000", "str:tokenIdentifier": "str:EGLD" }, - "code": "file:../output/crowdfunding-esdt.wasm" + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json" } } } diff --git a/contracts/examples/crypto-bubbles/scenarios/balanceOf.scen.json b/contracts/examples/crypto-bubbles/scenarios/balanceOf.scen.json index dac65aff9a..c7df4d91d5 100644 --- a/contracts/examples/crypto-bubbles/scenarios/balanceOf.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/balanceOf.scen.json @@ -15,7 +15,7 @@ "storage": { "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -84,7 +84,7 @@ "storage": { "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "2", diff --git a/contracts/examples/crypto-bubbles/scenarios/create.scen.json b/contracts/examples/crypto-bubbles/scenarios/create.scen.json index 017adddce6..8c42283f88 100644 --- a/contracts/examples/crypto-bubbles/scenarios/create.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/create.scen.json @@ -49,7 +49,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" } } } diff --git a/contracts/examples/crypto-bubbles/scenarios/exceptions.scen.json b/contracts/examples/crypto-bubbles/scenarios/exceptions.scen.json index f8caed348c..cb6668f202 100644 --- a/contracts/examples/crypto-bubbles/scenarios/exceptions.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/exceptions.scen.json @@ -12,7 +12,7 @@ "sc:crypto_bubbles": { "nonce": "0", "balance": "0x1300", - "code": "file:../output/crypto-bubbles.wasm", + "code": "mxsc:../output/crypto-bubbles.mxsc.json", "owner": "address:crypto_bubbles_owner" } } @@ -76,7 +76,7 @@ "nonce": "0", "balance": "0x1300", "storage": {}, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" } } } diff --git a/contracts/examples/crypto-bubbles/scenarios/joinGame.scen.json b/contracts/examples/crypto-bubbles/scenarios/joinGame.scen.json index aa224802ae..5a4d86f0d7 100644 --- a/contracts/examples/crypto-bubbles/scenarios/joinGame.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/joinGame.scen.json @@ -16,7 +16,7 @@ "str:playerBalance|address:acc1": "0x311", "str:playerBalance|address:acc2": "0x422" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -170,7 +170,7 @@ "str:playerBalance|address:acc1": "0x311", "str:playerBalance|address:acc2": "0x422" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json b/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json index 57680af622..acb311075e 100644 --- a/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/rewardAndSendToWallet.scen.json @@ -16,7 +16,7 @@ "str:playerBalance|address:acc1": "0x100", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm", + "code": "mxsc:../output/crypto-bubbles.mxsc.json", "owner": "address:crypto_bubbles_owner" }, "address:acc1": { @@ -94,7 +94,7 @@ "str:playerBalance|address:acc1": "0x100", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "0", diff --git a/contracts/examples/crypto-bubbles/scenarios/rewardWinner.scen.json b/contracts/examples/crypto-bubbles/scenarios/rewardWinner.scen.json index e81668a0d4..71bd5caf44 100644 --- a/contracts/examples/crypto-bubbles/scenarios/rewardWinner.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/rewardWinner.scen.json @@ -16,7 +16,7 @@ "str:playerBalance|address:acc1": "0x100", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm", + "code": "mxsc:../output/crypto-bubbles.mxsc.json", "owner": "address:crypto_bubbles_owner" } } @@ -71,7 +71,7 @@ "str:playerBalance|address:acc1": "0x300", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" } } } diff --git a/contracts/examples/crypto-bubbles/scenarios/rewardWinner_Last.scen.json b/contracts/examples/crypto-bubbles/scenarios/rewardWinner_Last.scen.json index aa20252361..223b2cb2d1 100644 --- a/contracts/examples/crypto-bubbles/scenarios/rewardWinner_Last.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/rewardWinner_Last.scen.json @@ -16,7 +16,7 @@ "str:playerBalance|address:acc1": "0x100", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm", + "code": "mxsc:../output/crypto-bubbles.mxsc.json", "owner": "address:crypto_bubbles_owner" } } @@ -71,7 +71,7 @@ "str:playerBalance|address:acc1": "0x1100", "str:playerBalance|address:acc2": "0x0100" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" } } } diff --git a/contracts/examples/crypto-bubbles/scenarios/topUp_ok.scen.json b/contracts/examples/crypto-bubbles/scenarios/topUp_ok.scen.json index 40ca3ee88d..f3e4c7177e 100644 --- a/contracts/examples/crypto-bubbles/scenarios/topUp_ok.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/topUp_ok.scen.json @@ -12,7 +12,7 @@ "sc:crypto_bubbles": { "nonce": "0", "balance": "0", - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -100,7 +100,7 @@ "str:playerBalance|address:acc1": "0x100", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json b/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json index bbcd965745..e5076d5775 100644 --- a/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/topUp_withdraw.scen.json @@ -12,7 +12,7 @@ "sc:crypto_bubbles": { "nonce": "0", "balance": "0", - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -104,7 +104,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "2", diff --git a/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json b/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json index 1db8bf7ea7..c11e60a733 100644 --- a/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/withdraw_Ok.scen.json @@ -15,7 +15,7 @@ "storage": { "str:playerBalance|address:acc1": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -79,7 +79,7 @@ "storage": { "str:playerBalance|address:acc1": "0xf0" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/examples/crypto-bubbles/scenarios/withdraw_TooMuch.scen.json b/contracts/examples/crypto-bubbles/scenarios/withdraw_TooMuch.scen.json index 3523be8bf2..dc7779817c 100644 --- a/contracts/examples/crypto-bubbles/scenarios/withdraw_TooMuch.scen.json +++ b/contracts/examples/crypto-bubbles/scenarios/withdraw_TooMuch.scen.json @@ -15,7 +15,7 @@ "storage": { "str:playerBalance|address:acc1": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -60,7 +60,7 @@ "storage": { "str:playerBalance|address:acc1": "0x100" }, - "code": "file:../output/crypto-bubbles.wasm" + "code": "mxsc:../output/crypto-bubbles.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_first.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_first.scen.json index 1e1d86c2c8..091d1d691e 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_first.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_first.scen.json @@ -61,7 +61,7 @@ "str:nrOwnedKitties|sc:kitty_auction_contract": "1", "str:owner|u32:1": "sc:kitty_auction_contract" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -73,7 +73,7 @@ "str:genZeroKittyAuctionDuration": "100,000", "str:auction|u32:1": "u8:0|u32:1|u8:100|u32:2|u16:500|u64:223456|sc:kitty_auction_contract|u32:1|u8:200|address:bidder1" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_max.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_max.scen.json index 0c37af6a11..60bfca350f 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_max.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_max.scen.json @@ -66,7 +66,7 @@ "str:nrOwnedKitties|sc:kitty_auction_contract": "1", "str:owner|u32:1": "sc:kitty_auction_contract" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -78,7 +78,7 @@ "str:genZeroKittyAuctionDuration": "100,000", "str:auction|u32:1": "u8:0|u32:1|u8:100|u32:2|u16:500|u64:223456|sc:kitty_auction_contract|u32:2|u16:500|address:bidder2" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_ok.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_ok.scen.json index af86f5c919..e4e956c0bc 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_ok.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_ok.scen.json @@ -66,7 +66,7 @@ "str:nrOwnedKitties|sc:kitty_auction_contract": "1", "str:owner|u32:1": "sc:kitty_auction_contract" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -78,7 +78,7 @@ "str:genZeroKittyAuctionDuration": "100,000", "str:auction|u32:1": "u8:0|u32:1|u8:100|u32:2|u16:500|u64:223456|sc:kitty_auction_contract|u32:1|u8:250|address:bidder2" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_too_low.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_too_low.scen.json index 471a88c676..cefc49a9f0 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_too_low.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_second_too_low.scen.json @@ -66,7 +66,7 @@ "str:nrOwnedKitties|sc:kitty_auction_contract": "1", "str:owner|u32:1": "sc:kitty_auction_contract" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -78,7 +78,7 @@ "str:genZeroKittyAuctionDuration": "100,000", "str:auction|u32:1": "u8:0|u32:1|u8:100|u32:2|u16:500|u64:223456|sc:kitty_auction_contract|u32:1|u8:200|address:bidder1" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_siring_auction.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_siring_auction.scen.json index 9ac802d7f1..2d455bb169 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_siring_auction.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/bid_siring_auction.scen.json @@ -57,7 +57,7 @@ "str:nrOwnedKitties|sc:kitty_auction_contract": "1", "str:owner|u32:1": "sc:kitty_auction_contract" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -69,7 +69,7 @@ "str:genZeroKittyAuctionDuration": "100,000", "str:auction|u32:1": "u8:1|u32:2|u16:1000|u32:2|u16:5000|u64:200000|address:bidder2|u32:2|u16:5000|address:bidder1" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_and_auction_gen_zero_kitty.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_and_auction_gen_zero_kitty.scen.json index 55249c347a..8700555bd3 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_and_auction_gen_zero_kitty.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_and_auction_gen_zero_kitty.scen.json @@ -54,7 +54,7 @@ "str:nrOwnedKitties|sc:kitty_auction_contract": "1", "str:owner|u32:1": "sc:kitty_auction_contract" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -66,7 +66,7 @@ "str:genZeroKittyAuctionDuration": "100,000", "str:auction|u32:1": "u8:0|u32:1|u8:100|u32:2|u16:500|u64:223456|sc:kitty_auction_contract|u32:0|u64:0|u64:0|u64:0|u64:0" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_sale_auction_not_owner.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_sale_auction_not_owner.scen.json index 8c1a565100..f68c0a726f 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_sale_auction_not_owner.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_sale_auction_not_owner.scen.json @@ -65,7 +65,7 @@ "str:nrOwnedKitties|address:bidder2": "1", "str:owner|u32:1": "address:bidder2" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -76,7 +76,7 @@ "str:genZeroKittyEndingPrice": "500", "str:genZeroKittyAuctionDuration": "100,000" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_sale_auction_ok.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_sale_auction_ok.scen.json index 581cb3fac6..80043e0699 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_sale_auction_ok.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_sale_auction_ok.scen.json @@ -66,7 +66,7 @@ "str:nrOwnedKitties|sc:kitty_auction_contract": "1", "str:owner|u32:1": "sc:kitty_auction_contract" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -78,7 +78,7 @@ "str:genZeroKittyAuctionDuration": "100,000", "str:auction|u32:1": "u8:0|u32:2|u16:1000|u32:2|u16:5000|u64:200000|address:bidder2|u32:0|u64:0|u64:0|u64:0|u64:0" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_siring_auction_not_owner.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_siring_auction_not_owner.scen.json index c81e72b3ed..817f4cf9b9 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_siring_auction_not_owner.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_siring_auction_not_owner.scen.json @@ -65,7 +65,7 @@ "str:nrOwnedKitties|address:bidder2": "1", "str:owner|u32:1": "address:bidder2" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -76,7 +76,7 @@ "str:genZeroKittyEndingPrice": "500", "str:genZeroKittyAuctionDuration": "100,000" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_siring_auction_ok.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_siring_auction_ok.scen.json index 9c3c3f4afd..6266eaeba2 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_siring_auction_ok.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/create_siring_auction_ok.scen.json @@ -66,7 +66,7 @@ "str:nrOwnedKitties|sc:kitty_auction_contract": "1", "str:owner|u32:1": "sc:kitty_auction_contract" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -78,7 +78,7 @@ "str:genZeroKittyAuctionDuration": "100,000", "str:auction|u32:1": "u8:1|u32:2|u16:1000|u32:2|u16:5000|u64:200000|address:bidder2|u32:0|u64:0|u64:0|u64:0|u64:0" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_no_bids.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_no_bids.scen.json index 3d495703b1..be0825e884 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_no_bids.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_no_bids.scen.json @@ -52,7 +52,7 @@ "str:nrOwnedKitties|sc:kitty_auction_contract": "1", "str:owner|u32:1": "sc:kitty_auction_contract" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -63,7 +63,7 @@ "str:genZeroKittyEndingPrice": "500", "str:genZeroKittyAuctionDuration": "100,000" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_max_early.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_max_early.scen.json index 29a1b81d01..c52cb665dd 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_max_early.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_max_early.scen.json @@ -57,7 +57,7 @@ "str:nrOwnedKitties|address:bidder2": "1", "str:owner|u32:1": "address:bidder2" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -68,7 +68,7 @@ "str:genZeroKittyEndingPrice": "500", "str:genZeroKittyAuctionDuration": "100,000" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_ok_early.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_ok_early.scen.json index 06f3477bc1..a347a943dd 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_ok_early.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_ok_early.scen.json @@ -56,7 +56,7 @@ "str:nrOwnedKitties|sc:kitty_auction_contract": "1", "str:owner|u32:1": "sc:kitty_auction_contract" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -68,7 +68,7 @@ "str:genZeroKittyAuctionDuration": "100,000", "str:auction|u32:1": "u8:0|u32:1|u8:100|u32:2|u16:500|u64:223456|sc:kitty_auction_contract|u32:1|u8:250|address:bidder2" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_ok_late.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_ok_late.scen.json index c2dacd9820..b9c71069a3 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_ok_late.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_auction_second_bid_ok_late.scen.json @@ -63,7 +63,7 @@ "str:nrOwnedKitties|address:bidder2": "1", "str:owner|u32:1": "address:bidder2" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -74,7 +74,7 @@ "str:genZeroKittyEndingPrice": "500", "str:genZeroKittyAuctionDuration": "100,000" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_siring_auction.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_siring_auction.scen.json index 86f22d97a2..b8bdfe64d2 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_siring_auction.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/end_siring_auction.scen.json @@ -58,7 +58,7 @@ "str:owner|u32:1": "address:bidder2", "str:sireAllowedAddress|u32:1": "address:bidder1" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -69,7 +69,7 @@ "str:genZeroKittyEndingPrice": "500", "str:genZeroKittyAuctionDuration": "100,000" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-auction/scenarios/init.scen.json b/contracts/examples/crypto-kitties/kitty-auction/scenarios/init.scen.json index 032deab851..1512bb8bf8 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/scenarios/init.scen.json +++ b/contracts/examples/crypto-kitties/kitty-auction/scenarios/init.scen.json @@ -104,7 +104,7 @@ "str:totalKitties": "1", "str:kitty|u32:0": "u8:0|u8:0|u8:0|u8:0|u8:0|u8:0|u8:0|u64:0|u64:0|u32:0|u32:0|u32:0|u16:0|u16:0" }, - "code": "file:../../kitty-ownership/output/kitty-ownership.wasm" + "code": "mxsc:../../kitty-ownership/output/kitty-ownership.mxsc.json" }, "sc:kitty_auction_contract": { "nonce": "0", @@ -115,7 +115,7 @@ "str:genZeroKittyEndingPrice": "500", "str:genZeroKittyAuctionDuration": "100,000" }, - "code": "file:../output/kitty-auction.wasm" + "code": "mxsc:../output/kitty-auction.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/scenarios/init.scen.json b/contracts/examples/crypto-kitties/kitty-genetic-alg/scenarios/init.scen.json index a88e88a6ed..135e2f0b53 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/scenarios/init.scen.json +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/scenarios/init.scen.json @@ -47,7 +47,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/kitty-genetic-alg.wasm" + "code": "mxsc:../output/kitty-genetic-alg.mxsc.json" } } } diff --git a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/approve_siring.scen.json b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/approve_siring.scen.json index 12a184998c..bf0e9ab06f 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/approve_siring.scen.json +++ b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/approve_siring.scen.json @@ -48,7 +48,7 @@ "str:nrOwnedKitties|address:acc2": "1", "str:sireAllowedAddress|u32:1": "address:acc2" }, - "code": "file:../output/kitty-ownership.wasm" + "code": "mxsc:../output/kitty-ownership.mxsc.json" }, "+": "" } diff --git a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/breed_ok.scen.json b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/breed_ok.scen.json index d206470490..6dc16cf766 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/breed_ok.scen.json +++ b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/breed_ok.scen.json @@ -63,7 +63,7 @@ "str:nrOwnedKitties|address:acc1": "1", "str:nrOwnedKitties|address:acc2": "1" }, - "code": "file:../output/kitty-ownership.wasm" + "code": "mxsc:../output/kitty-ownership.mxsc.json" }, "+": "" } diff --git a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/give_birth.scen.json b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/give_birth.scen.json index 45271172cf..8e355e6aa4 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/give_birth.scen.json +++ b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/give_birth.scen.json @@ -78,7 +78,7 @@ "str:nrOwnedKitties|address:acc1": "1", "str:nrOwnedKitties|address:acc2": "2" }, - "code": "file:../output/kitty-ownership.wasm" + "code": "mxsc:../output/kitty-ownership.mxsc.json" }, "+": "" } diff --git a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/init.scen.json b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/init.scen.json index 32fcb5bb60..4bf67121d3 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/init.scen.json +++ b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/init.scen.json @@ -84,7 +84,7 @@ "str:totalKitties": "1", "str:kitty|u32:0": "u8:0|u8:0|u8:0|u8:0|u8:0|u8:0|u8:0|u64:0|u64:0|u32:0|u32:0|u32:0|u16:0|u16:0" }, - "code": "file:../output/kitty-ownership.wasm" + "code": "mxsc:../output/kitty-ownership.mxsc.json" }, "+": "" } diff --git a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/setup_accounts.scen.json b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/setup_accounts.scen.json index f5a843b61b..830fc1b8d7 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/scenarios/setup_accounts.scen.json +++ b/contracts/examples/crypto-kitties/kitty-ownership/scenarios/setup_accounts.scen.json @@ -41,7 +41,7 @@ "str:nrOwnedKitties|address:acc1": "1", "str:nrOwnedKitties|address:acc2": "1" }, - "code": "file:../output/kitty-ownership.wasm" + "code": "mxsc:../output/kitty-ownership.mxsc.json" } }, "currentBlockInfo": { diff --git a/contracts/examples/digital-cash/scenarios/claim-egld.scen.json b/contracts/examples/digital-cash/scenarios/claim-egld.scen.json index ea6ab57e2f..5beca8d429 100644 --- a/contracts/examples/digital-cash/scenarios/claim-egld.scen.json +++ b/contracts/examples/digital-cash/scenarios/claim-egld.scen.json @@ -61,7 +61,7 @@ "str:deposit|0xdfc7efc43c36853ab160e783ad65766043734e30ce46188a448c44e2bbab9d91|str:.node_id|nested:str:EGLD|u64:0": "1", "str:deposit|0xdfc7efc43c36853ab160e783ad65766043734e30ce46188a448c44e2bbab9d91|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "1", @@ -207,7 +207,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json b/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json index 5401277488..66f4046250 100644 --- a/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json @@ -69,7 +69,7 @@ "str:deposit|0xdfc7efc43c36853ab160e783ad65766043734e30ce46188a448c44e2bbab9d91|str:.node_id|nested:str:CASHTOKEN-123456|u64:0": "1", "str:deposit|0xdfc7efc43c36853ab160e783ad65766043734e30ce46188a448c44e2bbab9d91|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -215,7 +215,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "0", diff --git a/contracts/examples/digital-cash/scenarios/forward.scen.json b/contracts/examples/digital-cash/scenarios/forward.scen.json index 012ce6ed25..0afbdfb1df 100644 --- a/contracts/examples/digital-cash/scenarios/forward.scen.json +++ b/contracts/examples/digital-cash/scenarios/forward.scen.json @@ -81,7 +81,7 @@ "str:deposit|0xe868c2baab2a20b612f1351da5945c52c60f5321c6cde572149db90c9e8fbfc8|str:.node_id|nested:str:CASHTOKEN-123456|u64:0": "1", "str:deposit|0xe868c2baab2a20b612f1351da5945c52c60f5321c6cde572149db90c9e8fbfc8|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "2", diff --git a/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json b/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json index 5af2c949e2..5568c1096e 100644 --- a/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json @@ -42,7 +42,7 @@ "str:deposit|0x558fd9b0dd9fed3d3bed883d3b92907743362c56b9728392f84b261f1cc5ae0a|str:.node_id|nested:str:EGLD|u64:0": "1", "str:deposit|0x558fd9b0dd9fed3d3bed883d3b92907743362c56b9728392f84b261f1cc5ae0a|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "1", @@ -113,7 +113,7 @@ "str:deposit|0xe868c2baab2a20b612f1351da5945c52c60f5321c6cde572149db90c9e8fbfc8|str:.node_id|nested:str:CASHTOKEN-123456|u64:0": "1", "str:deposit|0xe868c2baab2a20b612f1351da5945c52c60f5321c6cde572149db90c9e8fbfc8|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/examples/digital-cash/scenarios/withdraw-egld.scen.json b/contracts/examples/digital-cash/scenarios/withdraw-egld.scen.json index 683b12a358..c1fa91a5b5 100644 --- a/contracts/examples/digital-cash/scenarios/withdraw-egld.scen.json +++ b/contracts/examples/digital-cash/scenarios/withdraw-egld.scen.json @@ -58,7 +58,7 @@ "str:deposit|0xe868c2baab2a20b612f1351da5945c52c60f5321c6cde572149db90c9e8fbfc8|str:.node_id|nested:str:CASHTOKEN-123456|u64:0": "1", "str:deposit|0xe868c2baab2a20b612f1351da5945c52c60f5321c6cde572149db90c9e8fbfc8|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "2", @@ -150,7 +150,7 @@ "str:deposit|0xe868c2baab2a20b612f1351da5945c52c60f5321c6cde572149db90c9e8fbfc8|str:.node_id|nested:str:CASHTOKEN-123456|u64:0": "1", "str:deposit|0xe868c2baab2a20b612f1351da5945c52c60f5321c6cde572149db90c9e8fbfc8|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "4", diff --git a/contracts/examples/digital-cash/scenarios/withdraw-esdt.scen.json b/contracts/examples/digital-cash/scenarios/withdraw-esdt.scen.json index 2a73b3c011..0e1df70278 100644 --- a/contracts/examples/digital-cash/scenarios/withdraw-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/withdraw-esdt.scen.json @@ -58,7 +58,7 @@ "str:deposit|0xe868c2baab2a20b612f1351da5945c52c60f5321c6cde572149db90c9e8fbfc8|str:.node_id|nested:str:CASHTOKEN-123456|u64:0": "1", "str:deposit|0xe868c2baab2a20b612f1351da5945c52c60f5321c6cde572149db90c9e8fbfc8|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "1", @@ -150,7 +150,7 @@ "str:deposit|0x558fd9b0dd9fed3d3bed883d3b92907743362c56b9728392f84b261f1cc5ae0a|str:.node_id|nested:str:EGLD|u64:0": "1", "str:deposit|0x558fd9b0dd9fed3d3bed883d3b92907743362c56b9728392f84b261f1cc5ae0a|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/examples/esdt-transfer-with-fee/scenarios/claim.scen.json b/contracts/examples/esdt-transfer-with-fee/scenarios/claim.scen.json index 0dcf1708c7..885ca9a4c0 100644 --- a/contracts/examples/esdt-transfer-with-fee/scenarios/claim.scen.json +++ b/contracts/examples/esdt-transfer-with-fee/scenarios/claim.scen.json @@ -81,7 +81,7 @@ "str:token_fee|nested:str:MFNFT-567890": "u8:1|nested:str:USDC-aaaaaa|u64:0|biguint:5", "str:token_fee|nested:str:WEGLD-012345": "u8:1|nested:str:USDC-aaaaaa|u64:0|biguint:10" }, - "code": "file:../output/esdt-transfer-with-fee.wasm", + "code": "mxsc:../output/esdt-transfer-with-fee.mxsc.json", "owner": "address:owner" } } diff --git a/contracts/examples/esdt-transfer-with-fee/scenarios/deploy.scen.json b/contracts/examples/esdt-transfer-with-fee/scenarios/deploy.scen.json index 6f18b1cf45..c113e8832c 100644 --- a/contracts/examples/esdt-transfer-with-fee/scenarios/deploy.scen.json +++ b/contracts/examples/esdt-transfer-with-fee/scenarios/deploy.scen.json @@ -109,7 +109,7 @@ "sc:esdt-transfer-with-fee": { "nonce": "0", "storage": {}, - "code": "file:../output/esdt-transfer-with-fee.wasm", + "code": "mxsc:../output/esdt-transfer-with-fee.mxsc.json", "owner": "address:owner" } } diff --git a/contracts/examples/esdt-transfer-with-fee/scenarios/setup_fees_and_transfer.scen.json b/contracts/examples/esdt-transfer-with-fee/scenarios/setup_fees_and_transfer.scen.json index 018dda412f..0b4738d940 100644 --- a/contracts/examples/esdt-transfer-with-fee/scenarios/setup_fees_and_transfer.scen.json +++ b/contracts/examples/esdt-transfer-with-fee/scenarios/setup_fees_and_transfer.scen.json @@ -306,7 +306,7 @@ "str:paid_fees.value|u32:1": "nested:str:USDC-aaaaaa|u64:0", "str:paid_fees.mapped|nested:str:USDC-aaaaaa|u64:0": "13" }, - "code": "file:../output/esdt-transfer-with-fee.wasm", + "code": "mxsc:../output/esdt-transfer-with-fee.mxsc.json", "owner": "address:owner" } } diff --git a/contracts/examples/factorial/scenarios/factorial.scen.json b/contracts/examples/factorial/scenarios/factorial.scen.json index 343eab0242..37a3a7e230 100644 --- a/contracts/examples/factorial/scenarios/factorial.scen.json +++ b/contracts/examples/factorial/scenarios/factorial.scen.json @@ -9,7 +9,7 @@ "balance": "0" }, "sc:factorial": { - "code": "file:../output/factorial.wasm" + "code": "mxsc:../output/factorial.mxsc.json" } } }, diff --git a/contracts/examples/lottery-esdt/scenarios/buy-all-tickets-different-accounts.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-all-tickets-different-accounts.scen.json index eec0f7bb92..97ac4a1238 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-all-tickets-different-accounts.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-all-tickets-different-accounts.scen.json @@ -238,7 +238,7 @@ "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc5": "1", "+": "" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-more-tickets-than-allowed.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-more-tickets-than-allowed.scen.json index 9c82182a02..0a4db9473b 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-more-tickets-than-allowed.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-more-tickets-than-allowed.scen.json @@ -87,7 +87,7 @@ "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1", "+": "" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-deadline.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-deadline.scen.json index 86aeab033f..275c1ebbdb 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-deadline.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-deadline.scen.json @@ -89,7 +89,7 @@ "str:ticketHolder|nested:str:lottery_name|str:.item|u32:1": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-determined-winner.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-determined-winner.scen.json index 737bd01226..f1fe7fbc7f 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-determined-winner.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-determined-winner.scen.json @@ -70,7 +70,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-sold-out.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-sold-out.scen.json index 0594b4dcec..9f3b23542b 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-sold-out.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-ticket-after-sold-out.scen.json @@ -88,7 +88,7 @@ "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc2": "1" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-ticket-all-options.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-ticket-all-options.scen.json index 9c7914e0b5..181bb2b6ae 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-ticket-all-options.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-ticket-all-options.scen.json @@ -83,7 +83,7 @@ "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1", "+": "" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-ticket-another-account.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-ticket-another-account.scen.json index 6292d93494..98d9e37bf2 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-ticket-another-account.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-ticket-another-account.scen.json @@ -84,7 +84,7 @@ "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc2": "1" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-ticket-not-on-whitelist.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-ticket-not-on-whitelist.scen.json index 97f0d944b8..0fa30523d7 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-ticket-not-on-whitelist.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-ticket-not-on-whitelist.scen.json @@ -86,7 +86,7 @@ }, "+": "" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-ticket-same-account.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-ticket-same-account.scen.json index 9a3d95c114..485b5746ad 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-ticket-same-account.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-ticket-same-account.scen.json @@ -83,7 +83,7 @@ "str:ticketHolder|nested:str:lottery_name|str:.item|u32:2": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "2" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-ticket-second-lottery.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-ticket-second-lottery.scen.json index 3b5035a252..84b5e87b55 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-ticket-second-lottery.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-ticket-second-lottery.scen.json @@ -91,7 +91,7 @@ "str:ticketHolder|nested:str:lottery_$$$$|str:.item|u32:1": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_$$$$|address:acc1": "1" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-ticket-wrong-fee.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-ticket-wrong-fee.scen.json index 268b1ceb6d..f07677239e 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-ticket-wrong-fee.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-ticket-wrong-fee.scen.json @@ -80,7 +80,7 @@ "6-prize_pool": "biguint:0" } }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/buy-ticket.scen.json b/contracts/examples/lottery-esdt/scenarios/buy-ticket.scen.json index 65bba60c19..fec1ff000c 100644 --- a/contracts/examples/lottery-esdt/scenarios/buy-ticket.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/buy-ticket.scen.json @@ -82,7 +82,7 @@ "str:ticketHolder|nested:str:lottery_name|str:.item|u32:1": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/complex-prize-distribution.scen.json b/contracts/examples/lottery-esdt/scenarios/complex-prize-distribution.scen.json index 5a072f4b0b..60d817e065 100644 --- a/contracts/examples/lottery-esdt/scenarios/complex-prize-distribution.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/complex-prize-distribution.scen.json @@ -88,7 +88,7 @@ "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc9": "1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc10": "1" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } }, "currentBlockInfo": { @@ -177,7 +177,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/determine-winner-different-ticket-holders-winner-acc1.scen.json b/contracts/examples/lottery-esdt/scenarios/determine-winner-different-ticket-holders-winner-acc1.scen.json index 2d9ebeb70c..c835331c1a 100644 --- a/contracts/examples/lottery-esdt/scenarios/determine-winner-different-ticket-holders-winner-acc1.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/determine-winner-different-ticket-holders-winner-acc1.scen.json @@ -56,7 +56,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/determine-winner-early.scen.json b/contracts/examples/lottery-esdt/scenarios/determine-winner-early.scen.json index 70cd130eee..0fcad25ec0 100644 --- a/contracts/examples/lottery-esdt/scenarios/determine-winner-early.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/determine-winner-early.scen.json @@ -93,7 +93,7 @@ "str:ticketHolder|nested:str:lottery_name|str:.item|u32:1": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/determine-winner-same-ticket-holder.scen.json b/contracts/examples/lottery-esdt/scenarios/determine-winner-same-ticket-holder.scen.json index ef64ce5089..64f4d475ab 100644 --- a/contracts/examples/lottery-esdt/scenarios/determine-winner-same-ticket-holder.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/determine-winner-same-ticket-holder.scen.json @@ -57,7 +57,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/determine-winner-split-prize-pool.scen.json b/contracts/examples/lottery-esdt/scenarios/determine-winner-split-prize-pool.scen.json index be3997a7f7..7071e71f3c 100644 --- a/contracts/examples/lottery-esdt/scenarios/determine-winner-split-prize-pool.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/determine-winner-split-prize-pool.scen.json @@ -76,7 +76,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/lottery-init.scen.json b/contracts/examples/lottery-esdt/scenarios/lottery-init.scen.json index 145619b314..5c75f344cb 100644 --- a/contracts/examples/lottery-esdt/scenarios/lottery-init.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/lottery-init.scen.json @@ -65,7 +65,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/lottery-with-burn-percentage.scen.json b/contracts/examples/lottery-esdt/scenarios/lottery-with-burn-percentage.scen.json index cdbdf09ada..9d4876f388 100644 --- a/contracts/examples/lottery-esdt/scenarios/lottery-with-burn-percentage.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/lottery-with-burn-percentage.scen.json @@ -57,7 +57,7 @@ ] } }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } }, @@ -116,7 +116,7 @@ }, "str:burnPercentageForLottery|nested:str:lottery_name": "50" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" }, "+": "" } @@ -218,7 +218,7 @@ "str:ticketHolder|nested:str:lottery_name|str:.item|u32:2": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "2" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" }, "+": "" } @@ -270,7 +270,7 @@ "str:lotteryInfo|nested:str:lottery_name": "", "str:burnPercentageForLottery|nested:str:lottery_name": "0" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" }, "+": "" } diff --git a/contracts/examples/lottery-esdt/scenarios/start-after-announced-winner.scen.json b/contracts/examples/lottery-esdt/scenarios/start-after-announced-winner.scen.json index 07ee4f49ea..1d5e5c5a1f 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-after-announced-winner.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-after-announced-winner.scen.json @@ -68,7 +68,7 @@ "6-prize_pool": "biguint:0" } }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/start-all-options-bigger-whitelist.scen.json b/contracts/examples/lottery-esdt/scenarios/start-all-options-bigger-whitelist.scen.json index 038cbbde27..05fc6dcd4f 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-all-options-bigger-whitelist.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-all-options-bigger-whitelist.scen.json @@ -98,7 +98,7 @@ }, "+": "" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/start-alternative-function-name.scen.json b/contracts/examples/lottery-esdt/scenarios/start-alternative-function-name.scen.json index 5ae9cc595c..234780df81 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-alternative-function-name.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-alternative-function-name.scen.json @@ -65,7 +65,7 @@ "6-prize_pool": "biguint:0" } }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/start-fixed-deadline.scen.json b/contracts/examples/lottery-esdt/scenarios/start-fixed-deadline.scen.json index 5eb06a9a6e..8f0506c3be 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-fixed-deadline.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-fixed-deadline.scen.json @@ -65,7 +65,7 @@ "6-prize_pool": "biguint:0" } }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline-invalid-deadline.scen.json b/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline-invalid-deadline.scen.json index 0cf4cdfcd7..353bb29ad7 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline-invalid-deadline.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline-invalid-deadline.scen.json @@ -62,7 +62,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline-invalid-ticket-price-arg.scen.json b/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline-invalid-ticket-price-arg.scen.json index 430b093bcb..284841d451 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline-invalid-ticket-price-arg.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline-invalid-ticket-price-arg.scen.json @@ -56,7 +56,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline.scen.json b/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline.scen.json index 776dfeb4ae..583f7db682 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-limited-tickets-and-fixed-deadline.scen.json @@ -65,7 +65,7 @@ "6-prize_pool": "biguint:0" } }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/start-limited-tickets.scen.json b/contracts/examples/lottery-esdt/scenarios/start-limited-tickets.scen.json index caccbfd375..e1fbfd225e 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-limited-tickets.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-limited-tickets.scen.json @@ -65,7 +65,7 @@ "6-prize_pool": "biguint:0" } }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/start-second-lottery.scen.json b/contracts/examples/lottery-esdt/scenarios/start-second-lottery.scen.json index 397c8e0a43..ee6aa28aa8 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-second-lottery.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-second-lottery.scen.json @@ -74,7 +74,7 @@ "6-prize_pool": "biguint:0" } }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/start-with-all-options.scen.json b/contracts/examples/lottery-esdt/scenarios/start-with-all-options.scen.json index 0d3d5b4224..7c2ea2c097 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-with-all-options.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-with-all-options.scen.json @@ -66,7 +66,7 @@ }, "+": "" }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/lottery-esdt/scenarios/start-with-no-options.scen.json b/contracts/examples/lottery-esdt/scenarios/start-with-no-options.scen.json index 5acb7138ae..14c9deae2f 100644 --- a/contracts/examples/lottery-esdt/scenarios/start-with-no-options.scen.json +++ b/contracts/examples/lottery-esdt/scenarios/start-with-no-options.scen.json @@ -65,7 +65,7 @@ "6-prize_pool": "biguint:0" } }, - "code": "file:../output/lottery-esdt.wasm" + "code": "mxsc:../output/lottery-esdt.mxsc.json" } } } diff --git a/contracts/examples/multisig/scenarios/call_other_shard-2.scen.json b/contracts/examples/multisig/scenarios/call_other_shard-2.scen.json index 70fc626664..edbd724bff 100644 --- a/contracts/examples/multisig/scenarios/call_other_shard-2.scen.json +++ b/contracts/examples/multisig/scenarios/call_other_shard-2.scen.json @@ -13,7 +13,7 @@ "accounts": { "sc:other-shard-2": { "shard": "1", - "code": "file:../output/multisig.wasm" + "code": "mxsc:../output/multisig.mxsc.json" } } }, diff --git a/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json b/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json index 8b5d118e62..38b0411cdc 100644 --- a/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json +++ b/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json @@ -80,7 +80,7 @@ ] } }, - "code": "file:../output/multisig.wasm" + "code": "mxsc:../output/multisig.mxsc.json" }, "+": "" } diff --git a/contracts/examples/multisig/scenarios/deployFactorial.scen.json b/contracts/examples/multisig/scenarios/deployFactorial.scen.json index 96bda0545f..c2fea37893 100644 --- a/contracts/examples/multisig/scenarios/deployFactorial.scen.json +++ b/contracts/examples/multisig/scenarios/deployFactorial.scen.json @@ -76,7 +76,7 @@ "5-arguments": "u32:0" } }, - "code": "file:../output/multisig.wasm" + "code": "mxsc:../output/multisig.mxsc.json" }, "+": "" } @@ -184,7 +184,7 @@ "str:quorum": "2", "str:action_data.len": "3" }, - "code": "file:../output/multisig.wasm" + "code": "mxsc:../output/multisig.mxsc.json" }, "sc:factorial": { "nonce": "0", diff --git a/contracts/examples/multisig/scenarios/deployOtherMultisig.scen.json b/contracts/examples/multisig/scenarios/deployOtherMultisig.scen.json index a180dd0ce5..992aced239 100644 --- a/contracts/examples/multisig/scenarios/deployOtherMultisig.scen.json +++ b/contracts/examples/multisig/scenarios/deployOtherMultisig.scen.json @@ -132,7 +132,7 @@ "str:num_board_members": "1", "str:quorum": "1" }, - "code": "file:../output/multisig.wasm" + "code": "mxsc:../output/multisig.mxsc.json" }, "+": "" } diff --git a/contracts/examples/multisig/scenarios/steps/deploy.steps.json b/contracts/examples/multisig/scenarios/steps/deploy.steps.json index 3f3796ce4f..9872ff5644 100644 --- a/contracts/examples/multisig/scenarios/steps/deploy.steps.json +++ b/contracts/examples/multisig/scenarios/steps/deploy.steps.json @@ -107,7 +107,7 @@ "str:num_board_members": "3", "str:quorum": "2" }, - "code": "file:../../output/multisig.wasm" + "code": "mxsc:../../output/multisig.mxsc.json" }, "+": "" } diff --git a/contracts/examples/multisig/scenarios/upgrade_from_source.scen.json b/contracts/examples/multisig/scenarios/upgrade_from_source.scen.json index f8d1d7a942..228c96889c 100644 --- a/contracts/examples/multisig/scenarios/upgrade_from_source.scen.json +++ b/contracts/examples/multisig/scenarios/upgrade_from_source.scen.json @@ -114,7 +114,7 @@ "str:quorum": "1", "str:sum": "1234" }, - "code": "file:../output/multisig.wasm" + "code": "mxsc:../output/multisig.mxsc.json" }, "+": "" } diff --git a/contracts/examples/nft-minter/scenarios/create_nft.scen.json b/contracts/examples/nft-minter/scenarios/create_nft.scen.json index 2ede6d317e..34a6c2e8a2 100644 --- a/contracts/examples/nft-minter/scenarios/create_nft.scen.json +++ b/contracts/examples/nft-minter/scenarios/create_nft.scen.json @@ -116,7 +116,7 @@ "3-amount": "biguint:500" } }, - "code": "file:../output/nft-minter.wasm", + "code": "mxsc:../output/nft-minter.mxsc.json", "owner": "address:owner" }, "+": "" diff --git a/contracts/examples/nft-minter/scenarios/init.scen.json b/contracts/examples/nft-minter/scenarios/init.scen.json index 59f84128b5..e51e8a44ad 100644 --- a/contracts/examples/nft-minter/scenarios/init.scen.json +++ b/contracts/examples/nft-minter/scenarios/init.scen.json @@ -61,7 +61,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/nft-minter.wasm" + "code": "mxsc:../output/nft-minter.mxsc.json" }, "+": "" } @@ -83,7 +83,7 @@ "storage": { "str:nftTokenId": "str:NFT-123456" }, - "code": "file:../output/nft-minter.wasm", + "code": "mxsc:../output/nft-minter.mxsc.json", "owner": "address:owner" } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-after-deadline.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-after-deadline.scen.json index 24fb3ef5c9..8d27b65e46 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-after-deadline.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-after-deadline.scen.json @@ -57,7 +57,7 @@ "str:activationTimestamp": "780", "str:deadline": "123,780" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-before-activation.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-before-activation.scen.json index 89f93de0b1..37490334e9 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-before-activation.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-before-activation.scen.json @@ -57,7 +57,7 @@ "str:activationTimestamp": "780", "str:deadline": "123,780" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-before-beginning.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-before-beginning.scen.json index df83538fc2..862f552106 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-before-beginning.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-before-beginning.scen.json @@ -59,7 +59,7 @@ "str:activationTimestamp": "780", "str:deadline": "123,780" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-second-user.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-second-user.scen.json index fe4ea09e1a..fc9af8b7f7 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-second-user.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-second-user.scen.json @@ -63,7 +63,7 @@ "str:userStatus|0x0000002": "1", "str:user_count": "2" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-twice.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-twice.scen.json index 8d8843a979..6b36e51205 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-twice.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-twice.scen.json @@ -61,7 +61,7 @@ "str:userStatus|0x0000001": "1", "str:user_count": "1" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-wrong-ammount.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-wrong-ammount.scen.json index 76ff7127c7..b80ed7ad3b 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-wrong-ammount.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping-wrong-ammount.scen.json @@ -51,7 +51,7 @@ "str:activationTimestamp": "780", "str:deadline": "123,780" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping.scen.json index 88751bf945..78c5b08bd0 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-ping.scen.json @@ -62,7 +62,7 @@ "str:userStatus|0x0000001": "1", "str:user_count": "1" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-after-pong.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-after-pong.scen.json index f59d854a63..3575a5f292 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-after-pong.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-after-pong.scen.json @@ -62,7 +62,7 @@ "str:userStatus|0x0000001": "2", "str:user_count": "1" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-interrupted-1.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-interrupted-1.scen.json index c8ce0cdee4..2ab1990c83 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-interrupted-1.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-interrupted-1.scen.json @@ -68,7 +68,7 @@ "str:user_count": "2", "str:pongAllLastUser": "0" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } }, diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-interrupted-2.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-interrupted-2.scen.json index 8673c8b8b1..06eee7453e 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-interrupted-2.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all-interrupted-2.scen.json @@ -68,7 +68,7 @@ "str:user_count": "2", "str:pongAllLastUser": "1" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } }, @@ -127,7 +127,7 @@ "str:userStatus|0x0000002": "2", "str:user_count": "2" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } }, diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all.steps.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all.steps.json index d9eb446aa7..da2ddbebcc 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all.steps.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-all.steps.json @@ -56,7 +56,7 @@ "str:userStatus|0x0000002": "2", "str:user_count": "2" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-before-deadline.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-before-deadline.scen.json index 4856e3d274..60c4610d32 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-before-deadline.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-before-deadline.scen.json @@ -60,7 +60,7 @@ "str:userStatus|0x0000001": "1", "str:user_count": "1" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-twice.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-twice.scen.json index 56f14fb477..a6e4bfb11f 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-twice.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-twice.scen.json @@ -54,7 +54,7 @@ "str:userStatus|0x0000001": "2", "str:user_count": "1" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-without-ping.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-without-ping.scen.json index b6816006c9..5a78c10956 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-without-ping.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong-without-ping.scen.json @@ -56,7 +56,7 @@ "str:activationTimestamp": "780", "str:deadline": "123,780" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong.scen.json index 572e0e4738..f7540b9a24 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-call-pong.scen.json @@ -60,7 +60,7 @@ "str:userStatus|0x0000001": "2", "str:user_count": "1" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/ping-pong-egld/scenarios/ping-pong-init.scen.json b/contracts/examples/ping-pong-egld/scenarios/ping-pong-init.scen.json index f11c609c13..f4c8fa48cd 100644 --- a/contracts/examples/ping-pong-egld/scenarios/ping-pong-init.scen.json +++ b/contracts/examples/ping-pong-egld/scenarios/ping-pong-init.scen.json @@ -73,7 +73,7 @@ "str:activationTimestamp": "780", "str:deadline": "123,780" }, - "code": "file:../output/ping-pong-egld.wasm" + "code": "mxsc:../output/ping-pong-egld.mxsc.json" } } } diff --git a/contracts/examples/proxy-pause/scenarios/init.scen.json b/contracts/examples/proxy-pause/scenarios/init.scen.json index b92e2af69f..a887f1e690 100644 --- a/contracts/examples/proxy-pause/scenarios/init.scen.json +++ b/contracts/examples/proxy-pause/scenarios/init.scen.json @@ -12,7 +12,7 @@ "sc:use-module": { "nonce": "1", "balance": "0", - "code": "file:../../../feature-tests/use-module/output/use-module.wasm", + "code": "mxsc:../../../feature-tests/use-module/output/use-module.mxsc.json", "owner": "sc:proxy-pause" } }, diff --git a/contracts/examples/token-release/scenarios/test-add-group.scen.json b/contracts/examples/token-release/scenarios/test-add-group.scen.json index eebfeac6c5..d3d0083ae3 100644 --- a/contracts/examples/token-release/scenarios/test-add-group.scen.json +++ b/contracts/examples/token-release/scenarios/test-add-group.scen.json @@ -70,7 +70,7 @@ "5-release_ticks": "u64:4" } }, - "code": "file:../output/token-release.wasm" + "code": "mxsc:../output/token-release.mxsc.json" } } } diff --git a/contracts/examples/token-release/scenarios/test-add-user.scen.json b/contracts/examples/token-release/scenarios/test-add-user.scen.json index b6ffc71dcc..c689568590 100644 --- a/contracts/examples/token-release/scenarios/test-add-user.scen.json +++ b/contracts/examples/token-release/scenarios/test-add-user.scen.json @@ -96,7 +96,7 @@ "5-release_ticks": "u64:4" } }, - "code": "file:../output/token-release.wasm" + "code": "mxsc:../output/token-release.mxsc.json" } } } diff --git a/contracts/examples/token-release/scenarios/test-change-user.scen.json b/contracts/examples/token-release/scenarios/test-change-user.scen.json index d6df994358..59dbc4a2aa 100644 --- a/contracts/examples/token-release/scenarios/test-change-user.scen.json +++ b/contracts/examples/token-release/scenarios/test-change-user.scen.json @@ -125,7 +125,7 @@ "5-release_ticks": "u64:4" } }, - "code": "file:../output/token-release.wasm" + "code": "mxsc:../output/token-release.mxsc.json" } } } diff --git a/contracts/examples/token-release/scenarios/test-claim.scen.json b/contracts/examples/token-release/scenarios/test-claim.scen.json index 4098e14991..71ad0fc98a 100644 --- a/contracts/examples/token-release/scenarios/test-claim.scen.json +++ b/contracts/examples/token-release/scenarios/test-claim.scen.json @@ -115,7 +115,7 @@ "5-release_ticks": "u64:4" } }, - "code": "file:../output/token-release.wasm" + "code": "mxsc:../output/token-release.mxsc.json" } } } diff --git a/contracts/examples/token-release/scenarios/test-end-setup.scen.json b/contracts/examples/token-release/scenarios/test-end-setup.scen.json index 378eae1f48..8b515574ac 100644 --- a/contracts/examples/token-release/scenarios/test-end-setup.scen.json +++ b/contracts/examples/token-release/scenarios/test-end-setup.scen.json @@ -79,7 +79,7 @@ "5-release_ticks": "u64:4" } }, - "code": "file:../output/token-release.wasm" + "code": "mxsc:../output/token-release.mxsc.json" } } } diff --git a/contracts/examples/token-release/scenarios/test-init.scen.json b/contracts/examples/token-release/scenarios/test-init.scen.json index e0392c4f1c..b9cb086248 100644 --- a/contracts/examples/token-release/scenarios/test-init.scen.json +++ b/contracts/examples/token-release/scenarios/test-init.scen.json @@ -76,7 +76,7 @@ "str:setupPeriodStatus": "1", "str:tokenIdentifier": "str:FIRSTTOKEN-123456" }, - "code": "file:../output/token-release.wasm" + "code": "mxsc:../output/token-release.mxsc.json" } } }, @@ -127,7 +127,7 @@ "str:setupPeriodStatus": "1", "str:tokenIdentifier": "str:FIRSTTOKEN-123456" }, - "code": "file:../output/token-release.wasm", + "code": "mxsc:../output/token-release.mxsc.json", "owner": "address:owner" } } diff --git a/contracts/feature-tests/alloc-features/scenarios/boxed_bytes_zeros.scen.json b/contracts/feature-tests/alloc-features/scenarios/boxed_bytes_zeros.scen.json index d0d31a7663..33e86d7432 100644 --- a/contracts/feature-tests/alloc-features/scenarios/boxed_bytes_zeros.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/boxed_bytes_zeros.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/crypto_elliptic_curves_legacy.scen.json b/contracts/feature-tests/alloc-features/scenarios/crypto_elliptic_curves_legacy.scen.json index 0c99dff81a..6d248b37b2 100644 --- a/contracts/feature-tests/alloc-features/scenarios/crypto_elliptic_curves_legacy.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/crypto_elliptic_curves_legacy.scen.json @@ -7,7 +7,7 @@ "sc:features_contract": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/crypto_keccak256_legacy_alloc.scen.json b/contracts/feature-tests/alloc-features/scenarios/crypto_keccak256_legacy_alloc.scen.json index bc120f36d2..40f5e32742 100644 --- a/contracts/feature-tests/alloc-features/scenarios/crypto_keccak256_legacy_alloc.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/crypto_keccak256_legacy_alloc.scen.json @@ -7,7 +7,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/crypto_ripemd160_legacy.scen.json b/contracts/feature-tests/alloc-features/scenarios/crypto_ripemd160_legacy.scen.json index aa9e88ec6d..5a94cdb4a2 100644 --- a/contracts/feature-tests/alloc-features/scenarios/crypto_ripemd160_legacy.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/crypto_ripemd160_legacy.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/crypto_sha256_legacy_alloc.scen.json b/contracts/feature-tests/alloc-features/scenarios/crypto_sha256_legacy_alloc.scen.json index 10a462d90f..f13fd0fb40 100644 --- a/contracts/feature-tests/alloc-features/scenarios/crypto_sha256_legacy_alloc.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/crypto_sha256_legacy_alloc.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/crypto_verify_bls_legacy.scen.json b/contracts/feature-tests/alloc-features/scenarios/crypto_verify_bls_legacy.scen.json index 2ddbc331b2..2b5136ad9b 100644 --- a/contracts/feature-tests/alloc-features/scenarios/crypto_verify_bls_legacy.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/crypto_verify_bls_legacy.scen.json @@ -9,7 +9,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/crypto_verify_ed25519_legacy.scen.json b/contracts/feature-tests/alloc-features/scenarios/crypto_verify_ed25519_legacy.scen.json index 34bc0c45b3..b83f0167d5 100644 --- a/contracts/feature-tests/alloc-features/scenarios/crypto_verify_ed25519_legacy.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/crypto_verify_ed25519_legacy.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/crypto_verify_secp256k1_legacy.scen.json b/contracts/feature-tests/alloc-features/scenarios/crypto_verify_secp256k1_legacy.scen.json index 344deca606..d96d9777ab 100644 --- a/contracts/feature-tests/alloc-features/scenarios/crypto_verify_secp256k1_legacy.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/crypto_verify_secp256k1_legacy.scen.json @@ -9,7 +9,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_async_result_empty.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_async_result_empty.scen.json index 7d0d74fb58..359d598b7a 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_async_result_empty.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_async_result_empty.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_big_int_nested_alloc.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_big_int_nested_alloc.scen.json index 4388cccbf0..a96d4c94c4 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_big_int_nested_alloc.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_big_int_nested_alloc.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -46,7 +46,7 @@ "nonce": "*", "balance": "*", "storage": {}, - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_boxed_bytes.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_boxed_bytes.scen.json index ef74e11856..1999f2fdae 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_boxed_bytes.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_boxed_bytes.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -71,7 +71,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "2", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_multi_value_tuples_alloc.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_multi_value_tuples_alloc.scen.json index c8a7ec9be2..7de219ba85 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_multi_value_tuples_alloc.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_multi_value_tuples_alloc.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_ser_ex_1.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_ser_ex_1.scen.json index 0717a5d7d2..c5c19db0b6 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_ser_ex_1.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_ser_ex_1.scen.json @@ -7,7 +7,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_slice_u8.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_slice_u8.scen.json index e98c42810f..f6ebd27ff7 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_slice_u8.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_slice_u8.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -71,7 +71,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "2", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_str.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_str.scen.json index 9c1ad6bbab..aa58fe565c 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_str.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_str.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_str_box.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_str_box.scen.json index d6049adae6..83294f04ca 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_str_box.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_str_box.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_string.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_string.scen.json index a7bdffb68c..771de8673f 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_string.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_string.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_varargs_u32_alloc.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_varargs_u32_alloc.scen.json index 910625476e..209997904e 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_varargs_u32_alloc.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_varargs_u32_alloc.scen.json @@ -7,7 +7,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/echo_vec_u8.scen.json b/contracts/feature-tests/alloc-features/scenarios/echo_vec_u8.scen.json index 89af972dd1..1d257ba8f6 100644 --- a/contracts/feature-tests/alloc-features/scenarios/echo_vec_u8.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/echo_vec_u8.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -71,7 +71,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "2", diff --git a/contracts/feature-tests/alloc-features/scenarios/events_legacy.scen.json b/contracts/feature-tests/alloc-features/scenarios/events_legacy.scen.json index 4aba134190..77732672c4 100644 --- a/contracts/feature-tests/alloc-features/scenarios/events_legacy.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/events_legacy.scen.json @@ -7,7 +7,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/managed_buffer_concat_2.scen.json b/contracts/feature-tests/alloc-features/scenarios/managed_buffer_concat_2.scen.json index 4ea91a35ea..0c05c39311 100644 --- a/contracts/feature-tests/alloc-features/scenarios/managed_buffer_concat_2.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/managed_buffer_concat_2.scen.json @@ -6,7 +6,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/managed_buffer_load_slice.scen.json b/contracts/feature-tests/alloc-features/scenarios/managed_buffer_load_slice.scen.json index 32a6d6ac64..400d13d0e9 100644 --- a/contracts/feature-tests/alloc-features/scenarios/managed_buffer_load_slice.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/managed_buffer_load_slice.scen.json @@ -6,7 +6,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/managed_buffer_overwrite.scen.json b/contracts/feature-tests/alloc-features/scenarios/managed_buffer_overwrite.scen.json index 7a1b652cd4..c35643017f 100644 --- a/contracts/feature-tests/alloc-features/scenarios/managed_buffer_overwrite.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/managed_buffer_overwrite.scen.json @@ -6,7 +6,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/managed_buffer_set_slice.scen.json b/contracts/feature-tests/alloc-features/scenarios/managed_buffer_set_slice.scen.json index 91586be839..5518c77f6d 100644 --- a/contracts/feature-tests/alloc-features/scenarios/managed_buffer_set_slice.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/managed_buffer_set_slice.scen.json @@ -6,7 +6,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/only_owner_legacy.scen.json b/contracts/feature-tests/alloc-features/scenarios/only_owner_legacy.scen.json index 7ab1e5baa5..e60d5be50c 100644 --- a/contracts/feature-tests/alloc-features/scenarios/only_owner_legacy.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/only_owner_legacy.scen.json @@ -16,7 +16,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm", + "code": "mxsc:../output/alloc-features.mxsc.json", "owner": "address:owner" } } @@ -74,7 +74,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/alloc-features.wasm", + "code": "mxsc:../output/alloc-features.mxsc.json", "owner": "address:owner" }, "address:an_account": { diff --git a/contracts/feature-tests/alloc-features/scenarios/sc_result.scen.json b/contracts/feature-tests/alloc-features/scenarios/sc_result.scen.json index b608d270a1..a3f22fd47f 100644 --- a/contracts/feature-tests/alloc-features/scenarios/sc_result.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/sc_result.scen.json @@ -6,7 +6,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/alloc-features/scenarios/storage_address.scen.json b/contracts/feature-tests/alloc-features/scenarios/storage_address.scen.json index 0c1662520b..8194fa47db 100644 --- a/contracts/feature-tests/alloc-features/scenarios/storage_address.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/storage_address.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -46,7 +46,7 @@ "storage": { "str:addr": "str:____________address_____________" }, - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/alloc-features/scenarios/storage_opt_address.scen.json b/contracts/feature-tests/alloc-features/scenarios/storage_opt_address.scen.json index e1234137e8..ac580ba522 100644 --- a/contracts/feature-tests/alloc-features/scenarios/storage_opt_address.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/storage_opt_address.scen.json @@ -14,7 +14,7 @@ "str:____________address_too_long____________" ] }, - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -72,7 +72,7 @@ "storage": { "str:opt_addr": "1|str:____________address_____________" }, - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "+": "" } @@ -168,7 +168,7 @@ "storage": { "str:opt_addr": "" }, - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "+": "" } diff --git a/contracts/feature-tests/alloc-features/scenarios/storage_vec_u8.scen.json b/contracts/feature-tests/alloc-features/scenarios/storage_vec_u8.scen.json index 6a5dec1899..b47f2c3bde 100644 --- a/contracts/feature-tests/alloc-features/scenarios/storage_vec_u8.scen.json +++ b/contracts/feature-tests/alloc-features/scenarios/storage_vec_u8.scen.json @@ -8,7 +8,7 @@ "sc:alloc-features": { "nonce": "0", "balance": "0", - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -46,7 +46,7 @@ "storage": { "str:vec_u8": "123" }, - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -107,7 +107,7 @@ "storage": { "str:vec_u8": "0" }, - "code": "file:../output/alloc-features.wasm" + "code": "mxsc:../output/alloc-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/big_int_from_i64.scen.json b/contracts/feature-tests/basic-features/scenarios/big_int_from_i64.scen.json index 05fbc74ae6..5c56a11590 100644 --- a/contracts/feature-tests/basic-features/scenarios/big_int_from_i64.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/big_int_from_i64.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/big_int_to_i64.scen.json b/contracts/feature-tests/basic-features/scenarios/big_int_to_i64.scen.json index d260e734b2..2a526cff5f 100644 --- a/contracts/feature-tests/basic-features/scenarios/big_int_to_i64.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/big_int_to_i64.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/big_num_conversions.scen.json b/contracts/feature-tests/basic-features/scenarios/big_num_conversions.scen.json index 3db2c9e308..ab207714f4 100644 --- a/contracts/feature-tests/basic-features/scenarios/big_num_conversions.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/big_num_conversions.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/big_uint_eq_u64.scen.json b/contracts/feature-tests/basic-features/scenarios/big_uint_eq_u64.scen.json index abb3d019b9..3b6e224ebf 100644 --- a/contracts/feature-tests/basic-features/scenarios/big_uint_eq_u64.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/big_uint_eq_u64.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/big_uint_from_u64.scen.json b/contracts/feature-tests/basic-features/scenarios/big_uint_from_u64.scen.json index 36310f2726..6083fac2e9 100644 --- a/contracts/feature-tests/basic-features/scenarios/big_uint_from_u64.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/big_uint_from_u64.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/big_uint_log2.json b/contracts/feature-tests/basic-features/scenarios/big_uint_log2.json index a7f03797b3..18fea6a2c4 100644 --- a/contracts/feature-tests/basic-features/scenarios/big_uint_log2.json +++ b/contracts/feature-tests/basic-features/scenarios/big_uint_log2.json @@ -9,7 +9,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/big_uint_pow.json b/contracts/feature-tests/basic-features/scenarios/big_uint_pow.json index 39485016ff..7a4ed72391 100644 --- a/contracts/feature-tests/basic-features/scenarios/big_uint_pow.json +++ b/contracts/feature-tests/basic-features/scenarios/big_uint_pow.json @@ -9,7 +9,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/big_uint_sqrt.scen.json b/contracts/feature-tests/basic-features/scenarios/big_uint_sqrt.scen.json index fd89e697b3..b0bb89ea5e 100644 --- a/contracts/feature-tests/basic-features/scenarios/big_uint_sqrt.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/big_uint_sqrt.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/big_uint_to_u64.scen.json b/contracts/feature-tests/basic-features/scenarios/big_uint_to_u64.scen.json index 235a147280..545a3d2371 100644 --- a/contracts/feature-tests/basic-features/scenarios/big_uint_to_u64.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/big_uint_to_u64.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/block_info.scen.json b/contracts/feature-tests/basic-features/scenarios/block_info.scen.json index 555175d091..47dbc4f513 100644 --- a/contracts/feature-tests/basic-features/scenarios/block_info.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/block_info.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/codec_err.scen.json b/contracts/feature-tests/basic-features/scenarios/codec_err.scen.json index 5f03b8bdb6..4951776ea2 100644 --- a/contracts/feature-tests/basic-features/scenarios/codec_err.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/codec_err.scen.json @@ -6,7 +6,7 @@ "step": "setState", "accounts": { "sc:basic-features": { - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": {} } diff --git a/contracts/feature-tests/basic-features/scenarios/count_ones.scen.json b/contracts/feature-tests/basic-features/scenarios/count_ones.scen.json index 22aae164ba..f15dfa3b12 100644 --- a/contracts/feature-tests/basic-features/scenarios/count_ones.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/count_ones.scen.json @@ -9,7 +9,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_elliptic_curves.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_elliptic_curves.scen.json index 306abac354..cf3dee28b0 100644 --- a/contracts/feature-tests/basic-features/scenarios/crypto_elliptic_curves.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/crypto_elliptic_curves.scen.json @@ -7,7 +7,7 @@ "sc:features_contract": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_keccak256.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_keccak256.scen.json index 8ba030a518..e23758b0a7 100644 --- a/contracts/feature-tests/basic-features/scenarios/crypto_keccak256.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/crypto_keccak256.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_keccak256_legacy_managed.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_keccak256_legacy_managed.scen.json index 70070ed715..a74f834ecc 100644 --- a/contracts/feature-tests/basic-features/scenarios/crypto_keccak256_legacy_managed.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/crypto_keccak256_legacy_managed.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_ripemd160.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_ripemd160.scen.json index 6ff6b77d16..f049d09c97 100644 --- a/contracts/feature-tests/basic-features/scenarios/crypto_ripemd160.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/crypto_ripemd160.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_sha256.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_sha256.scen.json index 936c86ab7a..b910566062 100644 --- a/contracts/feature-tests/basic-features/scenarios/crypto_sha256.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/crypto_sha256.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_sha256_legacy_managed.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_sha256_legacy_managed.scen.json index e842da3ebc..6e6078ae96 100644 --- a/contracts/feature-tests/basic-features/scenarios/crypto_sha256_legacy_managed.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/crypto_sha256_legacy_managed.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls.scen.json index 76b5f8d7c2..ead18354dc 100644 --- a/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_bls.scen.json @@ -9,7 +9,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_verify_ed25519.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_ed25519.scen.json index c6098826c3..7ae00da020 100644 --- a/contracts/feature-tests/basic-features/scenarios/crypto_verify_ed25519.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_ed25519.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256k1.scen.json b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256k1.scen.json index e2eaec5525..7810299d50 100644 --- a/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256k1.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/crypto_verify_secp256k1.scen.json @@ -9,7 +9,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_array_u8.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_array_u8.scen.json index 3136f8ef8b..51b779c8d1 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_array_u8.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_array_u8.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -68,7 +68,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "2", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_arrayvec.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_arrayvec.scen.json index 24cc10b42a..c77d3eda3b 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_arrayvec.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_arrayvec.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_big_int_nested.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_big_int_nested.scen.json index f7eed44828..d7e2e01a55 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_big_int_nested.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_big_int_nested.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -92,7 +92,7 @@ "nonce": "*", "balance": "*", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_big_int_top.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_big_int_top.scen.json index 8e9055850c..da94065821 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_big_int_top.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_big_int_top.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -230,7 +230,7 @@ "nonce": "*", "balance": "*", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_big_uint.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_big_uint.scen.json index 2cec2f82d4..480111ebb3 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_big_uint.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_big_uint.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -138,7 +138,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_i32.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_i32.scen.json index ad8ad4af9c..bf57566319 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_i32.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_i32.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -204,7 +204,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "8", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_i64.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_i64.scen.json index 25f9bfa7a4..5f56933939 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_i64.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_i64.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -227,7 +227,7 @@ "nonce": "*", "balance": "*", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_ignore.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_ignore.scen.json index d08702b108..e53e7b4fec 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_ignore.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_ignore.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_managed_async_result_empty.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_managed_async_result_empty.scen.json index 6d4870aa9a..a3e1167c7a 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_managed_async_result_empty.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_managed_async_result_empty.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_managed_bytes.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_managed_bytes.scen.json index 97989a6f2b..88dbe4b8ca 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_managed_bytes.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_managed_bytes.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_managed_vec.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_managed_vec.scen.json index f9b1f4a398..aca55e1466 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_managed_vec.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_managed_vec.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_multi_value_tuples.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_multi_value_tuples.scen.json index 77ad2753af..bf91b38357 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_multi_value_tuples.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_multi_value_tuples.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_nothing.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_nothing.scen.json index 6891130259..5d11936798 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_nothing.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_nothing.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_tuple_into_multiresult.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_tuple_into_multiresult.scen.json index edd45fa11d..65f186f6cc 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_tuple_into_multiresult.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_tuple_into_multiresult.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_u64.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_u64.scen.json index 96f0ad1238..9257892545 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_u64.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_u64.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -137,7 +137,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_usize.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_usize.scen.json index f50cfa91da..d99b969f21 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_usize.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_usize.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -137,7 +137,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_varargs_managed_eager.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_varargs_managed_eager.scen.json index 27d7d42bb7..d66af41a87 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_varargs_managed_eager.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_varargs_managed_eager.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_varargs_managed_sum.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_varargs_managed_sum.scen.json index 1d7b3efa62..ece4592cfe 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_varargs_managed_sum.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_varargs_managed_sum.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/echo_varargs_u32.scen.json b/contracts/feature-tests/basic-features/scenarios/echo_varargs_u32.scen.json index bdf80a8de3..55b1eb47c4 100644 --- a/contracts/feature-tests/basic-features/scenarios/echo_varargs_u32.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/echo_varargs_u32.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/events.scen.json b/contracts/feature-tests/basic-features/scenarios/events.scen.json index 4d1928e2d9..b008a2b962 100644 --- a/contracts/feature-tests/basic-features/scenarios/events.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/events.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/get_caller.scen.json b/contracts/feature-tests/basic-features/scenarios/get_caller.scen.json index 85990b93fb..9e659b2bfc 100644 --- a/contracts/feature-tests/basic-features/scenarios/get_caller.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/get_caller.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/get_cumulated_validator_rewards.scen.json b/contracts/feature-tests/basic-features/scenarios/get_cumulated_validator_rewards.scen.json index 2ae50abaed..8fae020595 100644 --- a/contracts/feature-tests/basic-features/scenarios/get_cumulated_validator_rewards.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/get_cumulated_validator_rewards.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:viewer": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/managed_address_array.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_address_array.scen.json index 309844fb09..ac0810369d 100644 --- a/contracts/feature-tests/basic-features/scenarios/managed_address_array.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/managed_address_array.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/managed_address_managed_buffer.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_address_managed_buffer.scen.json index 80e63c2f85..0b8af730e2 100644 --- a/contracts/feature-tests/basic-features/scenarios/managed_address_managed_buffer.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/managed_address_managed_buffer.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/managed_buffer_concat.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_buffer_concat.scen.json index c698ccdda5..2b3a866b42 100644 --- a/contracts/feature-tests/basic-features/scenarios/managed_buffer_concat.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/managed_buffer_concat.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/managed_buffer_copy_slice.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_buffer_copy_slice.scen.json index e6837ef855..52ff3bcbfd 100644 --- a/contracts/feature-tests/basic-features/scenarios/managed_buffer_copy_slice.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/managed_buffer_copy_slice.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/managed_buffer_eq.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_buffer_eq.scen.json index ee171cd386..823abd84eb 100644 --- a/contracts/feature-tests/basic-features/scenarios/managed_buffer_eq.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/managed_buffer_eq.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/managed_buffer_set_random.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_buffer_set_random.scen.json index 66f06f1ee8..52d73f9ac9 100644 --- a/contracts/feature-tests/basic-features/scenarios/managed_buffer_set_random.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/managed_buffer_set_random.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/managed_vec_address_push.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_vec_address_push.scen.json index f9d179e635..eb5b33c456 100644 --- a/contracts/feature-tests/basic-features/scenarios/managed_vec_address_push.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/managed_vec_address_push.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/managed_vec_array_push.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_vec_array_push.scen.json index 7966e1c8b5..1412fd5e31 100644 --- a/contracts/feature-tests/basic-features/scenarios/managed_vec_array_push.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/managed_vec_array_push.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/managed_vec_biguint_push.scen.json b/contracts/feature-tests/basic-features/scenarios/managed_vec_biguint_push.scen.json index 8bbad52ddd..0d3ef768e4 100644 --- a/contracts/feature-tests/basic-features/scenarios/managed_vec_biguint_push.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/managed_vec_biguint_push.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/only_owner.scen.json b/contracts/feature-tests/basic-features/scenarios/only_owner.scen.json index 0e0a943710..cb977da246 100644 --- a/contracts/feature-tests/basic-features/scenarios/only_owner.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/only_owner.scen.json @@ -16,7 +16,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm", + "code": "mxsc:../output/basic-features.mxsc.json", "owner": "address:owner" } } @@ -74,7 +74,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm", + "code": "mxsc:../output/basic-features.mxsc.json", "owner": "address:owner" }, "address:an_account": { diff --git a/contracts/feature-tests/basic-features/scenarios/only_user_account.scen.json b/contracts/feature-tests/basic-features/scenarios/only_user_account.scen.json index ac24e2a36a..c7ee531d31 100644 --- a/contracts/feature-tests/basic-features/scenarios/only_user_account.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/only_user_account.scen.json @@ -12,12 +12,12 @@ "sc:evil-caller-sc": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } }, diff --git a/contracts/feature-tests/basic-features/scenarios/out_of_gas.scen.json b/contracts/feature-tests/basic-features/scenarios/out_of_gas.scen.json index ef19a23859..b7c9dd2c1a 100644 --- a/contracts/feature-tests/basic-features/scenarios/out_of_gas.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/out_of_gas.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/panic.scen.json b/contracts/feature-tests/basic-features/scenarios/panic.scen.json index 011efc8287..b3031c6fe0 100644 --- a/contracts/feature-tests/basic-features/scenarios/panic.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/panic.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -43,7 +43,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "1", diff --git a/contracts/feature-tests/basic-features/scenarios/return_codes.scen.json b/contracts/feature-tests/basic-features/scenarios/return_codes.scen.json index 0760f26fca..0f15a7d168 100644 --- a/contracts/feature-tests/basic-features/scenarios/return_codes.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/return_codes.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/sc_properties.scen.json b/contracts/feature-tests/basic-features/scenarios/sc_properties.scen.json index 787d2a3f1a..49c6c55c91 100644 --- a/contracts/feature-tests/basic-features/scenarios/sc_properties.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/sc_properties.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm", + "code": "mxsc:../output/basic-features.mxsc.json", "owner": "address:someone_else" }, "address:an_account": { @@ -121,7 +121,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm", + "code": "mxsc:../output/basic-features.mxsc.json", "owner": "address:someone_else" }, "address:an_account": { @@ -134,7 +134,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm", + "code": "mxsc:../output/basic-features.mxsc.json", "owner": "address:an_account" } } diff --git a/contracts/feature-tests/basic-features/scenarios/storage_big_int.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_big_int.scen.json index 36d2415114..4f2e6f23e2 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_big_int.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_big_int.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -46,7 +46,7 @@ "storage": { "str:big_int": "123" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -107,7 +107,7 @@ "storage": { "str:big_int": "0" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_big_uint.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_big_uint.scen.json index 4740549fba..e2896b0e1f 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_big_uint.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_big_uint.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -46,7 +46,7 @@ "storage": { "str:big_uint": "123" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -107,7 +107,7 @@ "storage": { "str:big_uint": "0" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_bool.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_bool.scen.json index c5601f3df4..1d8f9fda39 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_bool.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_bool.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -46,7 +46,7 @@ "storage": { "str:bool": "true" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -107,7 +107,7 @@ "storage": { "str:bool": "false" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_clear.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_clear.scen.json index b8d13db78e..9b844953f9 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_clear.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_clear.scen.json @@ -11,7 +11,7 @@ "storage": { "str:nr_to_clear": "42" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -66,7 +66,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "2", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_i64.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_i64.scen.json index 589c9e1a5e..d9f3bc0ec9 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_i64.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_i64.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -46,7 +46,7 @@ "storage": { "str:i64": "123" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -107,7 +107,7 @@ "storage": { "str:i64": "0" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_i64_bad.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_i64_bad.scen.json index a43426b22c..74ae9f7bff 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_i64_bad.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_i64_bad.scen.json @@ -11,7 +11,7 @@ "storage": { "str:i64": "0x008000000000000000" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_load_from_address.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_load_from_address.scen.json index 7df71919bf..300113dc1d 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_load_from_address.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_load_from_address.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:external-contract": { "nonce": "0", @@ -16,7 +16,7 @@ "storage": { "str:external-key": "str:external-value" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_managed_address.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_managed_address.scen.json index 5280f8cbce..deb20bc061 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_managed_address.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_managed_address.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -46,7 +46,7 @@ "storage": { "str:addr": "str:____________address_____________" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_map1.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_map1.scen.json index 32439e97cb..95afef9271 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_map1.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_map1.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -47,7 +47,7 @@ "storage": { "str:map1__________address_1_____________": "123" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -111,7 +111,7 @@ "storage": { "str:map1__________address_1_____________": "0" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_map2.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_map2.scen.json index 53c4a0132b..26e36e4f96 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_map2.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_map2.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -48,7 +48,7 @@ "storage": { "str:map2|str:__________address_1_____________|str:__________address_2_____________": "123" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -114,7 +114,7 @@ "storage": { "str:map2|str:__________address_1_____________|str:__________address_2_____________": "0" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_map3.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_map3.scen.json index 397186d2be..0dcaee928a 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_map3.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_map3.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -47,7 +47,7 @@ "storage": { "str:map3|0x00000057": "true" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -111,7 +111,7 @@ "storage": { "str:map3|0x00000057": "false" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_fungible_token.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_fungible_token.scen.json index 2651b97cca..190b33f2aa 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_fungible_token.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_fungible_token.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -30,7 +30,7 @@ ] } }, - "code": "file:../../esdt-system-sc-mock/output/esdt-system-sc-mock.wasm" + "code": "mxsc:../../esdt-system-sc-mock/output/esdt-system-sc-mock.mxsc.json" } } }, @@ -68,7 +68,7 @@ "storage": { "str:fungibleTokenMapper": "str:TICKER-000000" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -94,7 +94,7 @@ "storage": { "str:nrIssuedTokens": "1" }, - "code": "file:../../esdt-system-sc-mock/output/esdt-system-sc-mock.wasm" + "code": "mxsc:../../esdt-system-sc-mock/output/esdt-system-sc-mock.mxsc.json" } } }, @@ -111,7 +111,7 @@ "storage": { "str:fungibleTokenMapper": "" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } }, @@ -151,7 +151,7 @@ "storage": { "str:fungibleTokenMapper": "str:TICKER-111111" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -177,7 +177,7 @@ "storage": { "str:nrIssuedTokens": "2" }, - "code": "file:../../esdt-system-sc-mock/output/esdt-system-sc-mock.wasm" + "code": "mxsc:../../esdt-system-sc-mock/output/esdt-system-sc-mock.mxsc.json" } } }, @@ -194,7 +194,7 @@ "storage": { "str:fungibleTokenMapper": "" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } }, @@ -233,7 +233,7 @@ "storage": { "str:fungibleTokenMapper": "str:TICKER-222222" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -259,7 +259,7 @@ "storage": { "str:nrIssuedTokens": "3" }, - "code": "file:../../esdt-system-sc-mock/output/esdt-system-sc-mock.wasm" + "code": "mxsc:../../esdt-system-sc-mock/output/esdt-system-sc-mock.mxsc.json" } } }, @@ -277,7 +277,7 @@ "storage": { "str:fungibleTokenMapper": "" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } }, @@ -318,7 +318,7 @@ "storage": { "str:fungibleTokenMapper": "str:TICKER-333333" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -344,7 +344,7 @@ "storage": { "str:nrIssuedTokens": "4" }, - "code": "file:../../esdt-system-sc-mock/output/esdt-system-sc-mock.wasm" + "code": "mxsc:../../esdt-system-sc-mock/output/esdt-system-sc-mock.mxsc.json" } } }, @@ -361,7 +361,7 @@ "storage": { "str:fungibleTokenMapper": "str:TICKER-333333" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } }, @@ -397,7 +397,7 @@ "str:fungibleTokenMapper": "str:TICKER-333333", "str:rolesSet": "true" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "+": "" } @@ -427,7 +427,7 @@ "str:fungibleTokenMapper": "str:TICKER-333333", "str:rolesSet": "true" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } }, @@ -478,7 +478,7 @@ "str:fungibleTokenMapper": "str:TICKER-333333", "str:rolesSet": "true" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "+": "" } @@ -538,7 +538,7 @@ "str:fungibleTokenMapper": "str:TICKER-333333", "str:rolesSet": "true" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "+": "" } @@ -588,7 +588,7 @@ "str:fungibleTokenMapper": "str:TICKER-333333", "str:rolesSet": "true" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "+": "" } @@ -766,7 +766,7 @@ "storage": { "str:fungibleTokenMapper": "" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } }, diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_linked_list.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_linked_list.scen.json index 16ae4158e1..29aef32466 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_linked_list.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_linked_list.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -66,7 +66,7 @@ "str:list_mapper.node|u32:1": "u32:123|u32:1|u32:0|u32:0", "str:list_mapper.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -239,7 +239,7 @@ "str:list_mapper.node|u32:2": "u32:111|u32:2|u32:0|u32:1", "str:list_mapper.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -301,7 +301,7 @@ "str:list_mapper.node|u32:2": "u32:111|u32:2|u32:0|u32:0", "str:list_mapper.info": "u32:1|u32:2|u32:2|u32:2" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -339,7 +339,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -713,7 +713,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_map.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_map.scen.json index d2ec89206f..e3ba28d22b 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_map.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_map.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -72,7 +72,7 @@ "str:map_mapper.mapped|u32:123": "456", "str:map_mapper.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -209,7 +209,7 @@ "str:map_mapper.mapped|u32:111": "222", "str:map_mapper.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -296,7 +296,7 @@ "str:map_mapper.mapped|u32:111": "222", "str:map_mapper.info": "u32:1|u32:2|u32:2|u32:2" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -336,7 +336,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -376,7 +376,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -423,7 +423,7 @@ "str:map_mapper.value|u32:1": "123", "str:map_mapper.mapped|u32:123": "50" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -470,7 +470,7 @@ "str:map_mapper.value|u32:1": "123", "str:map_mapper.mapped|u32:123": "92" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -517,7 +517,7 @@ "str:map_mapper.value|u32:1": "123", "str:map_mapper.mapped|u32:123": "92" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -568,7 +568,7 @@ "str:map_mapper.value|u32:2": "142", "str:map_mapper.mapped|u32:142": "60" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -649,7 +649,7 @@ "str:map_mapper.value|u32:3": "167", "str:map_mapper.mapped|u32:167": "400" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -732,7 +732,7 @@ "str:map_mapper.value|u32:4": "78", "str:map_mapper.mapped|u32:78": "1078" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_map_storage.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_map_storage.scen.json index ac78a733a1..4d50190144 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_map_storage.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_map_storage.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -99,7 +99,7 @@ "str:map_storage_mapper.storage|u32:42|str:.mapped|u32:420": "421", "str:map_storage_mapper.storage|u32:42|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -231,7 +231,7 @@ "str:map_storage_mapper.storage|u32:43|str:.mapped|u32:430": "431", "str:map_storage_mapper.storage|u32:43|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -318,7 +318,7 @@ "str:map_storage_mapper.storage|u32:43|str:.mapped|u32:430": "431", "str:map_storage_mapper.storage|u32:43|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -368,7 +368,7 @@ "str:map_storage_mapper.storage|u32:43|str:.mapped|u32:430": "431", "str:map_storage_mapper.storage|u32:43|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -404,7 +404,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -443,7 +443,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -520,7 +520,7 @@ "str:map_storage_mapper.storage|u32:42|str:.node_id|u32:5": "1", "str:map_storage_mapper.storage|u32:42|str:.mapped|u32:5": "30" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -606,7 +606,7 @@ "str:map_storage_mapper.storage|u32:42|str:.node_id|u32:15": "2", "str:map_storage_mapper.storage|u32:42|str:.mapped|u32:15": "100" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -727,7 +727,7 @@ "str:map_storage_mapper.storage|u32:77|str:.node_id|u32:444": "2", "str:map_storage_mapper.storage|u32:77|str:.mapped|u32:444": "50" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_non_fungible_token.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_non_fungible_token.scen.json index 449115630a..e3a982447f 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_non_fungible_token.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_non_fungible_token.scen.json @@ -16,7 +16,7 @@ ] } }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -25,7 +25,7 @@ "0x000000000000000000010000000000000000000000000000000000000002ffff": { "nonce": "0", "balance": "0", - "code": "file:../../esdt-system-sc-mock/output/esdt-system-sc-mock.wasm" + "code": "mxsc:../../esdt-system-sc-mock/output/esdt-system-sc-mock.mxsc.json" } } }, @@ -70,7 +70,7 @@ "storage": { "str:nonFungibleTokenMapper": "" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } }, @@ -167,7 +167,7 @@ ] } }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -259,7 +259,7 @@ ] } }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -329,7 +329,7 @@ ] } }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_queue.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_queue.scen.json index d5a1718738..44224aecf8 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_queue.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_queue.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -67,7 +67,7 @@ "str:queue_mapper.value|u32:1": "123", "str:queue_mapper.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -154,7 +154,7 @@ "str:queue_mapper.value|u32:2": "111", "str:queue_mapper.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -217,7 +217,7 @@ "str:queue_mapper.value|u32:2": "111", "str:queue_mapper.info": "u32:1|u32:2|u32:2|u32:2" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -255,7 +255,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_set.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_set.scen.json index 210a1c67c3..0bdd153812 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_set.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_set.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -70,7 +70,7 @@ "str:set_mapper.node_id|u32:123": "1", "str:set_mapper.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -161,7 +161,7 @@ "str:set_mapper.node_id|u32:111": "2", "str:set_mapper.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -229,7 +229,7 @@ "str:set_mapper.node_id|u32:111": "2", "str:set_mapper.info": "u32:1|u32:2|u32:2|u32:2" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -269,7 +269,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_single_value.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_single_value.scen.json index 88f2dc82ce..192e773371 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_single_value.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_single_value.scen.json @@ -8,12 +8,12 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -178,13 +178,13 @@ "storage": { "str:my_single_value_mapper": "+234" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -308,13 +308,13 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -355,13 +355,13 @@ "storage": { "str:my_single_value_mapper": "42" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -402,13 +402,13 @@ "storage": { "str:my_single_value_mapper": "42" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_token_attributes.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_token_attributes.scen.json index a3cdb3e025..9b2a586cf2 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_token_attributes.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_token_attributes.scen.json @@ -8,7 +8,7 @@ "sc:contract": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:owner": { "nonce": "0", @@ -125,7 +125,7 @@ "str:TokenAttributes.mapping|nested:str:BOB-abcdef": "2", "str:TokenAttributes.mapping|nested:str:ALICE-abcdef": "1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } }, @@ -508,7 +508,7 @@ "str:TokenAttributes.mapping|nested:str:BOB-abcdef": "2", "str:TokenAttributes.mapping|nested:str:ALICE-abcdef": "1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } }, @@ -615,7 +615,7 @@ "str:TokenAttributes.mapping|nested:str:BOB-abcdef": "2", "str:TokenAttributes.mapping|nested:str:ALICE-abcdef": "1" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" } } } diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_unique_id.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_unique_id.scen.json index 61016ccddc..37f01b7d31 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_unique_id.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_unique_id.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -51,7 +51,7 @@ "str:unique_id_mapper.item|u32:4": "", "str:unique_id_mapper.item|u32:5": "" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -145,7 +145,7 @@ "str:unique_id_mapper.item|u32:4": "", "str:unique_id_mapper.item|u32:5": "" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -261,7 +261,7 @@ "str:unique_id_mapper.item|u32:4": "", "str:unique_id_mapper.item|u32:5": "" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_vec.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_vec.scen.json index de100c5db8..5fef8a4c7e 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_vec.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_vec.scen.json @@ -8,12 +8,12 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -157,13 +157,13 @@ "str:vec_mapper.item|u32:1": "123", "str:vec_mapper.item|u32:2": "111" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_whitelist.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_whitelist.scen.json index aeb76c95ae..f1332e11b5 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_whitelist.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_whitelist.scen.json @@ -7,12 +7,12 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -73,13 +73,13 @@ "storage": { "str:whitelistMapper|nested:str:item": "true" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -167,13 +167,13 @@ "str:whitelistMapper|nested:str:item": "true", "str:whitelistMapper|nested:str:item2": "true" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -213,13 +213,13 @@ "storage": { "str:whitelistMapper|nested:str:item2": "true" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_opt_managed_addr.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_opt_managed_addr.scen.json index fea0793e6c..352c818b2a 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_opt_managed_addr.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_opt_managed_addr.scen.json @@ -14,7 +14,7 @@ "str:____________address_too_long____________" ] }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -72,7 +72,7 @@ "storage": { "str:opt_addr": "1|str:____________address_____________" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "+": "" } @@ -168,7 +168,7 @@ "storage": { "str:opt_addr": "" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "+": "" } diff --git a/contracts/feature-tests/basic-features/scenarios/storage_raw_api_features.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_raw_api_features.scen.json index 920a49bfe3..a5817ab5d0 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_raw_api_features.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_raw_api_features.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:other": { "nonce": "0", @@ -16,7 +16,7 @@ "storage": { "str:otherStorage": "str:myValue" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -55,7 +55,7 @@ "storage": { "str:coolKey": "str:12345" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "+": "" } diff --git a/contracts/feature-tests/basic-features/scenarios/storage_reserved.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_reserved.scen.json index d465ad7015..99f42f58a2 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_reserved.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_reserved.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_u64.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_u64.scen.json index cd115057eb..d2cd5cc029 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_u64.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_u64.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -46,7 +46,7 @@ "storage": { "str:u64": "123" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -107,7 +107,7 @@ "storage": { "str:u64": "0" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_u64_bad.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_u64_bad.scen.json index c4d8fc1179..4bceff73de 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_u64_bad.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_u64_bad.scen.json @@ -11,7 +11,7 @@ "storage": { "str:u64": "0x010000000000000000" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_usize.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_usize.scen.json index 9104c4953a..e828b13e4a 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_usize.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_usize.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -46,7 +46,7 @@ "storage": { "str:usize": "123" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", @@ -107,7 +107,7 @@ "storage": { "str:usize": "0" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_usize_bad.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_usize_bad.scen.json index 710e519692..677f74a60b 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_usize_bad.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_usize_bad.scen.json @@ -11,7 +11,7 @@ "storage": { "str:usize": "0x0100000000" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/struct_eq.scen.json b/contracts/feature-tests/basic-features/scenarios/struct_eq.scen.json index 3bb871f700..b7f50c4e78 100644 --- a/contracts/feature-tests/basic-features/scenarios/struct_eq.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/struct_eq.scen.json @@ -6,7 +6,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_big_int.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_big_int.scen.json index f3b288dd3b..401aeeb905 100644 --- a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_big_int.scen.json +++ b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_big_int.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/big-float-features.wasm" + "code": "mxsc:../output/big-float-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_big_uint.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_big_uint.scen.json index 964e25c159..4203bb3df7 100644 --- a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_big_uint.scen.json +++ b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_big_uint.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/big-float-features.wasm" + "code": "mxsc:../output/big-float-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_frac.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_frac.scen.json index 2d29c89e72..090fbbcb6a 100644 --- a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_frac.scen.json +++ b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_frac.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/big-float-features.wasm" + "code": "mxsc:../output/big-float-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_int.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_int.scen.json index 4b15a34334..3cebf84091 100644 --- a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_int.scen.json +++ b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_int.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/big-float-features.wasm" + "code": "mxsc:../output/big-float-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_managed_buffer.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_managed_buffer.scen.json index a3bf11ac49..1b4bc80168 100644 --- a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_managed_buffer.scen.json +++ b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_managed_buffer.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/big-float-features.wasm" + "code": "mxsc:../output/big-float-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_parts.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_parts.scen.json index fe1de964a3..2cf7257630 100644 --- a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_parts.scen.json +++ b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_parts.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/big-float-features.wasm" + "code": "mxsc:../output/big-float-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_sci.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_sci.scen.json index f93cd46805..46815ec795 100644 --- a/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_sci.scen.json +++ b/contracts/feature-tests/big-float-features/scenarios/big_float_new_from_sci.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/big-float-features.wasm" + "code": "mxsc:../output/big-float-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_operator_checks.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_operator_checks.scen.json index a3a9e8e51e..e421ca6d55 100644 --- a/contracts/feature-tests/big-float-features/scenarios/big_float_operator_checks.scen.json +++ b/contracts/feature-tests/big-float-features/scenarios/big_float_operator_checks.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/big-float-features.wasm" + "code": "mxsc:../output/big-float-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/big-float-features/scenarios/big_float_operators.scen.json b/contracts/feature-tests/big-float-features/scenarios/big_float_operators.scen.json index ba3e55602f..30c020132b 100644 --- a/contracts/feature-tests/big-float-features/scenarios/big_float_operators.scen.json +++ b/contracts/feature-tests/big-float-features/scenarios/big_float_operators.scen.json @@ -7,7 +7,7 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/big-float-features.wasm" + "code": "mxsc:../output/big-float-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_egld.scen.json b/contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_egld.scen.json index e21dccb71a..bd34a7bd77 100644 --- a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_egld.scen.json @@ -10,12 +10,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -76,13 +76,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_esdt.scen.json b/contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_esdt.scen.json index 456679520e..5be64f70d5 100644 --- a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios-promises/promises_call_async_accept_esdt.scen.json @@ -13,12 +13,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -94,13 +94,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_egld.scen.json b/contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_egld.scen.json index d5d07ca52c..bccd559f18 100644 --- a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_egld.scen.json @@ -10,12 +10,12 @@ "sc:vault": { "nonce": "0", "balance": "1000", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -89,13 +89,13 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "1000", "storage": "*", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_esdt.scen.json b/contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_esdt.scen.json index 6e92b55c02..921b523c36 100644 --- a/contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios-promises/promises_call_async_retrieve_esdt.scen.json @@ -13,12 +13,12 @@ "esdt": { "str:TEST-TOKENA": "1000" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -93,7 +93,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -102,7 +102,7 @@ "str:TEST-TOKENA": "1000" }, "storage": "*", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_call_callback_directly.scen.json b/contracts/feature-tests/composability/scenarios-promises/promises_call_callback_directly.scen.json index a34a78ee53..8c7b6cc914 100644 --- a/contracts/feature-tests/composability/scenarios-promises/promises_call_callback_directly.scen.json +++ b/contracts/feature-tests/composability/scenarios-promises/promises_call_callback_directly.scen.json @@ -10,7 +10,7 @@ "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_multi_transfer.scen.json b/contracts/feature-tests/composability/scenarios-promises/promises_multi_transfer.scen.json index 281033d98c..76d850b072 100644 --- a/contracts/feature-tests/composability/scenarios-promises/promises_multi_transfer.scen.json +++ b/contracts/feature-tests/composability/scenarios-promises/promises_multi_transfer.scen.json @@ -29,12 +29,12 @@ ] } }, - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" }, "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" } } }, @@ -115,7 +115,7 @@ "storage": { "str:call_counts|nested:str:accept_funds_echo_payment": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:promises": { "nonce": "0", @@ -140,7 +140,7 @@ } }, "storage": {}, - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer.scen.json b/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer.scen.json index c437759563..ff8117b937 100644 --- a/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer.scen.json +++ b/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer.scen.json @@ -10,12 +10,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:promises": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -56,12 +56,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:promises": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -120,12 +120,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:promises": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -185,13 +185,13 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:promises": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas1.scen.json b/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas1.scen.json index c7f2bcf720..44813ecbe8 100644 --- a/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas1.scen.json +++ b/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas1.scen.json @@ -10,12 +10,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:promises": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -56,12 +56,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:promises": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas2.scen.json b/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas2.scen.json index 4286273b35..ad5779bad2 100644 --- a/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas2.scen.json +++ b/contracts/feature-tests/composability/scenarios-promises/promises_single_transfer_gas2.scen.json @@ -10,12 +10,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:promises": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_2.scen.json b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_2.scen.json index a3063d4fd4..d65fac3d62 100644 --- a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_2.scen.json +++ b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_2.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", "balance": "1000", - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } }, @@ -122,13 +122,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "2" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", "balance": "998", "storage": {}, - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_x.scen.json b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_x.scen.json index de57ad4749..457db86a61 100644 --- a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_x.scen.json +++ b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_egld_x.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", "balance": "1000", - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } }, @@ -59,13 +59,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "5" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", "balance": "995", "storage": {}, - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_esdt_2.scen.json b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_esdt_2.scen.json index 6fffb3d06d..1f166c77fe 100644 --- a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_esdt_2.scen.json +++ b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_esdt_2.scen.json @@ -11,7 +11,7 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", @@ -19,7 +19,7 @@ "esdt": { "str:REC-TOKEN": "1000" }, - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } }, @@ -128,7 +128,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "*" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", @@ -137,7 +137,7 @@ "str:REC-TOKEN": "999" }, "storage": {}, - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_esdt_x.scen.json b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_esdt_x.scen.json index b87d98ba3c..c828788784 100644 --- a/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_esdt_x.scen.json +++ b/contracts/feature-tests/composability/scenarios-unsupported/recursive_caller_esdt_x.scen.json @@ -11,7 +11,7 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", @@ -19,7 +19,7 @@ "esdt": { "str:REC-TOKEN": "1000" }, - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } }, @@ -65,7 +65,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "*" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", @@ -74,7 +74,7 @@ "str:REC-TOKEN": "995" }, "storage": {}, - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json b/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json index b3b1e29284..e9733ed926 100644 --- a/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_queue_async.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder-queue": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-queue/output/forwarder-queue.wasm" + "code": "mxsc:../forwarder-queue/output/forwarder-queue.mxsc.json" } } }, @@ -103,12 +103,12 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder-queue": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-queue/output/forwarder-queue.wasm" + "code": "mxsc:../forwarder-queue/output/forwarder-queue.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_async_accept_egld.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_async_accept_egld.scen.json index d254e67690..1ee44ee161 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_async_accept_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_async_accept_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -88,7 +88,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -99,7 +99,7 @@ "nested:0x00" ] }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_async_accept_esdt.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_async_accept_esdt.scen.json index 0b0cb4fdf8..942d382432 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_async_accept_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_async_accept_esdt.scen.json @@ -14,12 +14,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -106,7 +106,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -117,7 +117,7 @@ "nested:0x00" ] }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_async_echo.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_async_echo.scen.json index 3106ae3f82..e7f19cbfe4 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_async_echo.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_async_echo.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -77,7 +77,7 @@ "storage": { "str:call_counts|nested:str:echo_arguments": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -90,7 +90,7 @@ "biguint:2" ] }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_async_send_and_retrieve_multi_transfer_funds.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_async_send_and_retrieve_multi_transfer_funds.scen.json index e4851ad8cb..50768223c6 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_async_send_and_retrieve_multi_transfer_funds.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_async_send_and_retrieve_multi_transfer_funds.scen.json @@ -21,7 +21,7 @@ ] } }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -40,7 +40,7 @@ ] } }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -94,7 +94,7 @@ } }, "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -130,7 +130,7 @@ }, "str:callback_payments.len": "2" }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_builtin_nft_local_mint_via_async_call.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_builtin_nft_local_mint_via_async_call.scen.json index 9e170ecb5b..f88dbf266e 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_builtin_nft_local_mint_via_async_call.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_builtin_nft_local_mint_via_async_call.scen.json @@ -20,7 +20,7 @@ ] } }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -93,7 +93,7 @@ "str:callback_args.len": "1", "str:callback_args.item|u32:01": "nested:0x00" }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_builtin_nft_local_mint_via_sync_call.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_builtin_nft_local_mint_via_sync_call.scen.json index 6503cb4257..08256f0f20 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_builtin_nft_local_mint_via_sync_call.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_builtin_nft_local_mint_via_sync_call.scen.json @@ -20,7 +20,7 @@ ] } }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -90,7 +90,7 @@ } }, "storage": {}, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_call_async_retrieve_multi_transfer.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_call_async_retrieve_multi_transfer.scen.json index 6420fcf2a2..efd575bd41 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_call_async_retrieve_multi_transfer.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_call_async_retrieve_multi_transfer.scen.json @@ -22,12 +22,12 @@ ] } }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -79,7 +79,7 @@ } }, "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -104,7 +104,7 @@ }, "str:callback_payments.len": "1" }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json index 3019e05d6e..042cb3f1a1 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json @@ -11,7 +11,7 @@ "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } }, "newAddresses": [ @@ -63,7 +63,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" }, "+": "" @@ -102,7 +102,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" }, "+": "" @@ -140,7 +140,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" }, "+": "" diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json index 0d8672d169..db90ad1c44 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json @@ -6,10 +6,10 @@ "accounts": { "address:a_user": {}, "sc:forwarder": { - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" }, "sc:child": { - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" } } @@ -36,7 +36,7 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" }, "+": "" } @@ -66,7 +66,7 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "+": "" } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json index 027f242aa3..4ec7fc5233 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json @@ -6,11 +6,11 @@ "accounts": { "address:a_user": {}, "sc:forwarder": { - "code": "file:../forwarder-raw/output/forwarder-raw.wasm", + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json", "owner": "sc:forwarder" }, "sc:vault": { - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" } } }, @@ -39,11 +39,11 @@ "nonce": "*" }, "sc:forwarder": { - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" }, "sc:vault": { - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_direct_egld.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_direct_egld.scen.json index ecea60c879..987ae3a743 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_direct_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_direct_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -55,13 +55,13 @@ "nonce": "0", "balance": "1000", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_direct_esdt.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_direct_esdt.scen.json index 02c5b80081..e12281f649 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_direct_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_direct_esdt.scen.json @@ -14,12 +14,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -81,13 +81,13 @@ "str:TEST-TOKENA": "1000" }, "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_direct_multi_esdt.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_direct_multi_esdt.scen.json index a2dcaa1d3b..ba3ad97b1d 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_direct_multi_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_direct_multi_esdt.scen.json @@ -19,7 +19,7 @@ "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -75,7 +75,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_init_async.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_init_async.scen.json index 0095ed9dc2..0dcd6c51d0 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_init_async.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_init_async.scen.json @@ -10,7 +10,7 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" } }, "newAddresses": [ diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json index 5fc148b2e4..2764d1cf6f 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json @@ -10,7 +10,7 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" } }, "newAddresses": [ diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_echo.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_echo.scen.json index ece56f50d9..9eb2b6ff9a 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_echo.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_echo.scen.json @@ -10,7 +10,7 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" } }, "newAddresses": [ diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_sync_echo.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_sync_echo.scen.json index 8c14b4df7a..0aa2252af8 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_sync_echo.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_sync_echo.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_sync_echo_caller.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_sync_echo_caller.scen.json index cfcf393b11..142880c7db 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_sync_echo_caller.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_sync_echo_caller.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_sync_egld.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_sync_egld.scen.json index fe6e6d878d..9468662c1f 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_sync_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_sync_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_sync_readonly.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_sync_readonly.scen.json index 26d1bab3f0..f1b53d61ea 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_sync_readonly.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_sync_readonly.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -59,13 +59,13 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_sync_same_context.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_sync_same_context.scen.json index d59d7077ff..633ea175b1 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_sync_same_context.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_sync_same_context.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -75,7 +75,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -83,7 +83,7 @@ "storage": { "str:call_counts|nested:str:echo_arguments": "1" }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_sync_same_context_egld.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_sync_same_context_egld.scen.json index 7443d68fdc..1d05069f9b 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_sync_same_context_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_sync_same_context_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -56,7 +56,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -64,7 +64,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_transf_exec_accept_egld.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_transf_exec_accept_egld.scen.json index 1e5e457201..16d11f4bb7 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_transf_exec_accept_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_transf_exec_accept_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -58,13 +58,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, @@ -105,13 +105,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "2" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_transf_exec_reject_egld.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_transf_exec_reject_egld.scen.json index 9e88f15e13..18851435bf 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_transf_exec_reject_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_transf_exec_reject_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder-raw/output/forwarder-raw.wasm" + "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_add_quantity.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_add_quantity.scen.json index 49f0ad828a..f1269f886a 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_add_quantity.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_add_quantity.scen.json @@ -35,7 +35,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:forwarder2": { "nonce": "0", @@ -51,7 +51,7 @@ "lastNonce": "1" } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -149,7 +149,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:forwarder2": { "nonce": "0", @@ -165,7 +165,7 @@ "lastNonce": "1" } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_burn.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_burn.scen.json index e21cf50060..20cd2caf77 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_burn.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_burn.scen.json @@ -35,7 +35,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:forwarder2": { "nonce": "0", @@ -51,7 +51,7 @@ "lastNonce": "1" } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -149,7 +149,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:forwarder2": { "nonce": "0", @@ -166,7 +166,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_create.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_create.scen.json index 55fe0a1c20..74507cce97 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_create.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_create.scen.json @@ -35,7 +35,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:forwarder2": { "nonce": "0", @@ -51,7 +51,7 @@ "lastNonce": "1" } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -184,7 +184,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:forwarder2": { "nonce": "0", @@ -200,7 +200,7 @@ "lastNonce": "1" } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_local_burn.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_local_burn.scen.json index 2ab770183b..100cb911d8 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_local_burn.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_local_burn.scen.json @@ -21,7 +21,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:forwarder2": { "nonce": "0", @@ -36,7 +36,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -118,7 +118,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:forwarder2": { "nonce": "0", @@ -133,7 +133,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_local_mint.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_local_mint.scen.json index 110df179af..338ab906db 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_local_mint.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_builtin_nft_local_mint.scen.json @@ -21,7 +21,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:forwarder2": { "nonce": "0", @@ -36,7 +36,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -118,7 +118,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:forwarder2": { "nonce": "0", @@ -133,7 +133,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_egld.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_egld.scen.json index 9b98f84d10..9cd226c7a1 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -77,13 +77,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_esdt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_esdt.scen.json index 9ff0fe9485..34a7d7654c 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_esdt.scen.json @@ -14,12 +14,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -95,13 +95,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_nft.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_nft.scen.json index d299df3cf8..dd10cdc13b 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_nft.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_async_accept_nft.scen.json @@ -25,12 +25,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -119,13 +119,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_async_multi_transfer.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_async_multi_transfer.scen.json index de77e0e73d..81b18ee338 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_async_multi_transfer.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_async_multi_transfer.scen.json @@ -30,12 +30,12 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" } } }, @@ -85,7 +85,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -110,7 +110,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -179,7 +179,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "2" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -195,7 +195,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_egld.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_egld.scen.json index ad3624c70b..6ca9c80751 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "1000", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -90,13 +90,13 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "1000", "storage": "*", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_esdt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_esdt.scen.json index dcfb83a5de..9db4d8336d 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_esdt.scen.json @@ -14,12 +14,12 @@ "esdt": { "str:TEST-TOKENA": "1000" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -94,7 +94,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -103,7 +103,7 @@ "str:TEST-TOKENA": "1000" }, "storage": "*", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_nft.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_nft.scen.json index de3ec7f0e8..4acbd88a04 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_nft.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_async_retrieve_nft.scen.json @@ -21,12 +21,12 @@ ] } }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -101,7 +101,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -117,7 +117,7 @@ } }, "storage": "*", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_egld.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_egld.scen.json index ec45c50163..5642b77332 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -86,13 +86,13 @@ "storage": { "str:call_counts|nested:str:accept_funds_echo_payment": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_esdt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_esdt.scen.json index d13dfecca8..6c4f314f64 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_esdt.scen.json @@ -14,12 +14,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -137,13 +137,13 @@ "storage": { "str:call_counts|nested:str:accept_funds_echo_payment": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_multi_transfer.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_multi_transfer.scen.json index a4ab7d4054..a43d29a351 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_multi_transfer.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_multi_transfer.scen.json @@ -30,12 +30,12 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" } } }, @@ -191,7 +191,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -208,7 +208,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_nft.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_nft.scen.json index 939e11b718..42006c6f1d 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_nft.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_nft.scen.json @@ -25,12 +25,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -131,13 +131,13 @@ "storage": { "str:call_counts|nested:str:accept_funds_echo_payment": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_egld.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_egld.scen.json index a3484dfb21..afa64d2935 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -79,13 +79,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_esdt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_esdt.scen.json index 60b14e8a0a..f656f32bbe 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_esdt.scen.json @@ -14,12 +14,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -97,13 +97,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_nft.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_nft.scen.json index 65e361bb83..e278c410f0 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_nft.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_accept_then_read_nft.scen.json @@ -25,12 +25,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -121,13 +121,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld.scen.json index 204e9b2964..e49cdd79a2 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "1000", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -79,13 +79,13 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "1000", "storage": "*", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_esdt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_esdt.scen.json index aed08a2a1e..495fc7daf1 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_esdt.scen.json @@ -14,12 +14,12 @@ "esdt": { "str:TEST-TOKENA": "1000" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -83,7 +83,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -92,7 +92,7 @@ "str:TEST-TOKENA": "1000" }, "storage": "*", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_nft.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_nft.scen.json index 10fc06f83a..9db3741d17 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_nft.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_nft.scen.json @@ -21,12 +21,12 @@ ] } }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -90,7 +90,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -106,7 +106,7 @@ } }, "storage": "*", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_egld.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_egld.scen.json index 6bea05217e..e7dc44b5fe 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -77,13 +77,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_egld_twice.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_egld_twice.scen.json index 67436ed1f6..7cdfac5240 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_egld_twice.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_egld_twice.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -96,13 +96,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "2" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_esdt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_esdt.scen.json index edb0352d03..e178f01ed9 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_esdt.scen.json @@ -14,12 +14,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -95,13 +95,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_esdt_twice.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_esdt_twice.scen.json index de1b57fbd0..ec9beda4cf 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_esdt_twice.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_esdt_twice.scen.json @@ -14,12 +14,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -118,13 +118,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "2" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_multi_transfer.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_multi_transfer.scen.json index efd0428f2c..c666b3e6f3 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_multi_transfer.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_multi_transfer.scen.json @@ -30,12 +30,12 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" } } }, @@ -85,7 +85,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -110,7 +110,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -179,7 +179,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "2" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -196,7 +196,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_nft.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_nft.scen.json index f9c0cf7201..3cdbe62959 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_nft.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_nft.scen.json @@ -21,12 +21,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -107,13 +107,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_return_values.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_return_values.scen.json index 6c1242ab80..369bb80505 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_return_values.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_return_values.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -82,13 +82,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_sft_twice.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_sft_twice.scen.json index 7a1279f1e8..aa4f9a60b0 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_sft_twice.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_accept_sft_twice.scen.json @@ -21,12 +21,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -127,13 +127,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "2" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_reject_multi_transfer.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_reject_multi_transfer.scen.json index 4155aed706..75e226f62e 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_reject_multi_transfer.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_reject_multi_transfer.scen.json @@ -30,12 +30,12 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" } } }, @@ -80,7 +80,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -105,7 +105,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_reject_nft.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_reject_nft.scen.json index c1c0dc7f5f..43b327c0a6 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_reject_nft.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_transf_exec_reject_nft.scen.json @@ -11,7 +11,7 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -26,7 +26,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios/forwarder_contract_change_owner.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_contract_change_owner.scen.json index 92bfc2874b..04da8ca5e6 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_contract_change_owner.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_contract_change_owner.scen.json @@ -7,10 +7,10 @@ "address:a_user": {}, "address:new_owner": {}, "sc:forwarder": { - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:child": { - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" } } @@ -42,7 +42,7 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "address:new_owner" }, "+": "" diff --git a/contracts/feature-tests/composability/scenarios/forwarder_contract_deploy.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_contract_deploy.scen.json index 4dec52453f..d2526c599d 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_contract_deploy.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_contract_deploy.scen.json @@ -11,7 +11,7 @@ "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } }, "newAddresses": [ @@ -72,7 +72,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" }, "+": "" @@ -110,7 +110,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" }, "+": "" @@ -147,14 +147,14 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" }, "sc:child3": { "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" }, "+": "" @@ -192,7 +192,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" }, "+": "" diff --git a/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json index 645d99a63d..35e9a1aa3d 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json @@ -6,10 +6,10 @@ "accounts": { "address:a_user": {}, "sc:forwarder": { - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:child": { - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "owner": "sc:forwarder" } } @@ -36,7 +36,7 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "+": "" } @@ -64,7 +64,7 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "+": "" } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_get_esdt_local_roles.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_get_esdt_local_roles.scen.json index 007c8186c9..33a415bcfb 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_get_esdt_local_roles.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_get_esdt_local_roles.scen.json @@ -11,7 +11,7 @@ "esdt": { "str:ESDT-123456": "200" }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "address:viewer": { "nonce": "0", @@ -54,7 +54,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "address:viewer": { "nonce": "0", @@ -100,7 +100,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "address:viewer": { "nonce": "0", @@ -149,7 +149,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "address:viewer": { "nonce": "0", diff --git a/contracts/feature-tests/composability/scenarios/forwarder_get_esdt_token_data.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_get_esdt_token_data.scen.json index 494fcd97d1..014395323a 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_get_esdt_token_data.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_get_esdt_token_data.scen.json @@ -36,7 +36,7 @@ "frozen": "true" } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "address:other": { "nonce": "0", diff --git a/contracts/feature-tests/composability/scenarios/forwarder_nft_add_uri.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_nft_add_uri.scen.json index 4994109512..1df605242f 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_nft_add_uri.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_nft_add_uri.scen.json @@ -24,7 +24,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -91,7 +91,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -162,7 +162,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_nft_create.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_nft_create.scen.json index 0b9d9e9043..e195e87203 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_nft_create.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_nft_create.scen.json @@ -35,7 +35,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -140,7 +140,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_nft_create_and_send.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_nft_create_and_send.scen.json index 15816150d1..e71dcabc63 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_nft_create_and_send.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_nft_create_and_send.scen.json @@ -35,7 +35,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -161,7 +161,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_nft_current_nonce.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_nft_current_nonce.scen.json index b74629cd10..e5a2f665c3 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_nft_current_nonce.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_nft_current_nonce.scen.json @@ -33,7 +33,7 @@ "lastNonce": "1" } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios/forwarder_nft_decode_complex_attributes.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_nft_decode_complex_attributes.scen.json index 100a9b6060..84fab40b1a 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_nft_decode_complex_attributes.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_nft_decode_complex_attributes.scen.json @@ -35,7 +35,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -117,7 +117,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_nft_transfer_async.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_nft_transfer_async.scen.json index 814be53981..aa18721e89 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_nft_transfer_async.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_nft_transfer_async.scen.json @@ -31,7 +31,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -91,7 +91,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_nft_transfer_exec.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_nft_transfer_exec.scen.json index c75769bc3c..884dbafadc 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_nft_transfer_exec.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_nft_transfer_exec.scen.json @@ -31,7 +31,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -92,7 +92,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_nft_update_attributes.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_nft_update_attributes.scen.json index 2dfcd41267..6001dc2826 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_nft_update_attributes.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_nft_update_attributes.scen.json @@ -34,7 +34,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -111,7 +111,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -172,7 +172,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "+": "" } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_no_endpoint.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_no_endpoint.scen.json index 0cf6541378..85584ec665 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_no_endpoint.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_no_endpoint.scen.json @@ -6,7 +6,7 @@ "accounts": { "address:a_user": {}, "sc:forwarder": { - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios/forwarder_retrieve_funds_with_accept_func.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_retrieve_funds_with_accept_func.scen.json index 76e39bf040..c37a497481 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_retrieve_funds_with_accept_func.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_retrieve_funds_with_accept_func.scen.json @@ -18,12 +18,12 @@ "esdt": { "str:THIRDTOKEN-abcdef": "5,000,000" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -77,7 +77,7 @@ "str:SECTOKEN-abcdef": "2,000,000" }, "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -88,7 +88,7 @@ "storage": { "+": "" }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_send_esdt_multi_transfer.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_send_esdt_multi_transfer.scen.json index 88867a91b6..80d7b639e2 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_send_esdt_multi_transfer.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_send_esdt_multi_transfer.scen.json @@ -30,7 +30,7 @@ ] } }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -97,7 +97,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -175,7 +175,7 @@ } }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios/forwarder_send_twice_egld.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_send_twice_egld.scen.json index e554b3c4d0..1c810395f2 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_send_twice_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_send_twice_egld.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "1000", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -97,13 +97,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "2" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "998", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_send_twice_esdt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_send_twice_esdt.scen.json index f3a5f6f53d..c06aec4e65 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_send_twice_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_send_twice_esdt.scen.json @@ -11,7 +11,7 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -19,7 +19,7 @@ "esdt": { "str:FWD-TOKEN": "1000" }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -111,7 +111,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "2" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -120,7 +120,7 @@ "str:FWD-TOKEN": "998" }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_sync_echo.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_sync_echo.scen.json index 5d92534f8f..631ff246c3 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_sync_echo.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_sync_echo.scen.json @@ -11,12 +11,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, diff --git a/contracts/feature-tests/composability/scenarios/forwarder_tranfer_esdt_with_fees.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_tranfer_esdt_with_fees.scen.json index f917eb6932..dab0808f47 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_tranfer_esdt_with_fees.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_tranfer_esdt_with_fees.scen.json @@ -18,12 +18,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -80,7 +80,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -89,7 +89,7 @@ "str:FWD-TOKEN": "10" }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -151,7 +151,7 @@ "storage": { "+": "" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -160,7 +160,7 @@ "str:FWD-TOKEN": "20" }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -222,7 +222,7 @@ "storage": { "+": "" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -231,7 +231,7 @@ "str:FWD-TOKEN": "30" }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } }, @@ -293,7 +293,7 @@ "storage": { "+": "" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -302,7 +302,7 @@ "str:FWD-TOKEN": "40" }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_validate_token_identifier.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_validate_token_identifier.scen.json index d9e0db20fd..13c12bd294 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_validate_token_identifier.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_validate_token_identifier.scen.json @@ -11,7 +11,7 @@ "esdt": { "str:ESDT-123456": "200" }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "address:viewer": { "nonce": "0", diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_init.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_init.scen.json index 5966acb95b..b334698541 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_init.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_init.scen.json @@ -11,7 +11,7 @@ "sc:proxy-first": { "nonce": "0", "balance": "0", - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" } }, "newAddresses": [ @@ -61,7 +61,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", @@ -70,7 +70,7 @@ "str:init_arg": "123", "str:last_payment": "100" }, - "code": "file:../proxy-test-second/output/proxy-test-second.wasm" + "code": "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_message_otherShard.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_message_otherShard.scen.json index 474ca43c6f..6add2dcd48 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_message_otherShard.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_message_otherShard.scen.json @@ -15,7 +15,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" } } }, @@ -53,7 +53,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_message_otherShard_callback.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_message_otherShard_callback.scen.json index d89aba6317..ba55671d03 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_message_otherShard_callback.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_message_otherShard_callback.scen.json @@ -15,7 +15,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" } } }, @@ -53,7 +53,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_message_sameShard.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_message_sameShard.scen.json index 41c97ebf4a..be8d248968 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_message_sameShard.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_message_sameShard.scen.json @@ -15,12 +15,12 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", "balance": "0", - "code": "file:../proxy-test-second/output/proxy-test-second.wasm" + "code": "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" } } }, @@ -58,7 +58,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", @@ -69,7 +69,7 @@ "str:message_me_3": "0x030303", "str:message_me_4": "0xfefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefe" }, - "code": "file:../proxy-test-second/output/proxy-test-second.wasm" + "code": "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_message_sameShard_callback.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_message_sameShard_callback.scen.json index 360458083d..3a3b6df137 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_message_sameShard_callback.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_message_sameShard_callback.scen.json @@ -15,12 +15,12 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", "balance": "0", - "code": "file:../proxy-test-second/output/proxy-test-second.wasm" + "code": "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" } } }, @@ -59,7 +59,7 @@ "str:other_contract": "sc:proxy-second", "str:callback_info": "0x5555" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", @@ -70,7 +70,7 @@ "str:message_me_3": "0x030303", "str:message_me_4": "0xfefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefefe" }, - "code": "file:../proxy-test-second/output/proxy-test-second.wasm" + "code": "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_payment_otherShard.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_payment_otherShard.scen.json index da3a5771ec..1d70c4b0a8 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_payment_otherShard.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_payment_otherShard.scen.json @@ -15,7 +15,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" } } }, @@ -54,7 +54,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_payment_otherShard_callback.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_payment_otherShard_callback.scen.json index 6aed1f8306..7dc0e1031b 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_payment_otherShard_callback.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_payment_otherShard_callback.scen.json @@ -15,7 +15,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" } } }, @@ -55,7 +55,7 @@ "str:other_contract": "sc:proxy-second", "str:CB_CLOSURE|str:1...............................": "nested:str:payCallback|nested:" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_payment_sameShard.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_payment_sameShard.scen.json index cf34f89a42..15a78e78c3 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_payment_sameShard.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_payment_sameShard.scen.json @@ -15,12 +15,12 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", "balance": "0", - "code": "file:../proxy-test-second/output/proxy-test-second.wasm" + "code": "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" } } }, @@ -59,7 +59,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", @@ -68,7 +68,7 @@ "str:pay_me_arg": "0x56", "str:last_payment": "0x123400" }, - "code": "file:../proxy-test-second/output/proxy-test-second.wasm" + "code": "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_payment_sameShard_callback.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_payment_sameShard_callback.scen.json index 570e3ac015..1d58a786e0 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_payment_sameShard_callback.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_payment_sameShard_callback.scen.json @@ -15,12 +15,12 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", "balance": "0", - "code": "file:../proxy-test-second/output/proxy-test-second.wasm" + "code": "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:other_contract": "sc:proxy-second", "str:callback_info": "0x7777" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", @@ -71,7 +71,7 @@ "str:pay_me_arg": "0x56", "str:last_payment": "0x123400" }, - "code": "file:../proxy-test-second/output/proxy-test-second.wasm" + "code": "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json index 5c694b1a78..a2efb5de8e 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json @@ -53,7 +53,7 @@ "storage": { "str:other_contract": "sc:proxy-second" }, - "code": "file:../proxy-test-first/output/proxy-test-first.wasm" + "code": "mxsc:../proxy-test-first/output/proxy-test-first.mxsc.json" }, "sc:proxy-second": { "nonce": "0", @@ -62,7 +62,7 @@ "str:init_arg": "456", "str:last_payment": "200" }, - "code": "file:../proxy-test-second/output/proxy-test-second.wasm" + "code": "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/recursive_caller_egld_1.scen.json b/contracts/feature-tests/composability/scenarios/recursive_caller_egld_1.scen.json index b6c9073b40..36be60fafd 100644 --- a/contracts/feature-tests/composability/scenarios/recursive_caller_egld_1.scen.json +++ b/contracts/feature-tests/composability/scenarios/recursive_caller_egld_1.scen.json @@ -12,12 +12,12 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", "balance": "1000", - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } }, @@ -102,13 +102,13 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", "balance": "999", "storage": {}, - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/recursive_caller_esdt_1.scen.json b/contracts/feature-tests/composability/scenarios/recursive_caller_esdt_1.scen.json index d23216b46e..448e153545 100644 --- a/contracts/feature-tests/composability/scenarios/recursive_caller_esdt_1.scen.json +++ b/contracts/feature-tests/composability/scenarios/recursive_caller_esdt_1.scen.json @@ -12,7 +12,7 @@ "sc:vault": { "nonce": "0", "balance": "0", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", @@ -20,7 +20,7 @@ "esdt": { "str:REC-TOKEN": "1000" }, - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } }, @@ -112,7 +112,7 @@ "storage": { "str:call_counts|nested:str:accept_funds": "1" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:recursive-caller": { "nonce": "0", @@ -121,7 +121,7 @@ "str:REC-TOKEN": "999" }, "storage": {}, - "code": "file:../recursive-caller/output/recursive-caller.wasm" + "code": "mxsc:../recursive-caller/output/recursive-caller.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/send_egld.scen.json b/contracts/feature-tests/composability/scenarios/send_egld.scen.json index 1aa2ef485b..8efba53a4a 100644 --- a/contracts/feature-tests/composability/scenarios/send_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/send_egld.scen.json @@ -8,7 +8,7 @@ "sc:basic-features": { "nonce": "1000", "balance": "200", - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -64,7 +64,7 @@ "nonce": "1000", "balance": "0", "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/composability/scenarios/send_esdt.scen.json b/contracts/feature-tests/composability/scenarios/send_esdt.scen.json index 09b6573a82..534882ca27 100644 --- a/contracts/feature-tests/composability/scenarios/send_esdt.scen.json +++ b/contracts/feature-tests/composability/scenarios/send_esdt.scen.json @@ -11,7 +11,7 @@ "esdt": { "str:SENDESDT": "1,000" }, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -84,7 +84,7 @@ "str:SENDESDT": "800" }, "storage": {}, - "code": "file:../forwarder/output/forwarder.wasm" + "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/deploy_erc20_and_crowdfunding.scen.json b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/deploy_erc20_and_crowdfunding.scen.json index ab45dfe82b..3aabba7450 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/deploy_erc20_and_crowdfunding.scen.json +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/deploy_erc20_and_crowdfunding.scen.json @@ -65,7 +65,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" } } }, @@ -110,7 +110,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "sc:crowdfunding": { "nonce": "0", @@ -120,7 +120,7 @@ "str:deadline": "123,456", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/crowdfunding-erc20.wasm" + "code": "mxsc:../output/crowdfunding-erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_with_insufficient_allowance.scen.json b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_with_insufficient_allowance.scen.json index 2ce0b7cbfb..7f5d34cb5d 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_with_insufficient_allowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_with_insufficient_allowance.scen.json @@ -85,7 +85,7 @@ "str:allowance|address:acc1|sc:crowdfunding": "400,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "sc:crowdfunding": { "nonce": "0", @@ -95,7 +95,7 @@ "str:deadline": "123,456", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/crowdfunding-erc20.wasm" + "code": "mxsc:../output/crowdfunding-erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_with_sufficient_allowance.scen.json b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_with_sufficient_allowance.scen.json index efe1fecf02..cd87006871 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_with_sufficient_allowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_with_sufficient_allowance.scen.json @@ -64,7 +64,7 @@ "str:allowance|address:acc1|sc:crowdfunding": "500,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "sc:crowdfunding": { "nonce": "0", @@ -74,7 +74,7 @@ "str:deadline": "123,456", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/crowdfunding-erc20.wasm" + "code": "mxsc:../output/crowdfunding-erc20.mxsc.json" } } }, @@ -133,7 +133,7 @@ "str:allowance|address:acc1|sc:crowdfunding": "0", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "sc:crowdfunding": { "nonce": "0", @@ -145,7 +145,7 @@ "str:deposit|address:acc1": "500,000", "str:erc20Balance": "500,000" }, - "code": "file:../output/crowdfunding-erc20.wasm" + "code": "mxsc:../output/crowdfunding-erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_without_allowance.scen.json b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_without_allowance.scen.json index 9f5d256102..313c848955 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_without_allowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/fund_without_allowance.scen.json @@ -62,7 +62,7 @@ "str:allowance|address:erc20_owner|address:acc1": "400,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "sc:crowdfunding": { "nonce": "0", @@ -72,7 +72,7 @@ "str:deadline": "123,456", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/crowdfunding-erc20.wasm" + "code": "mxsc:../output/crowdfunding-erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/set_accounts.step.json b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/set_accounts.step.json index 1e32842590..c88d05c61d 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/set_accounts.step.json +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/scenarios/set_accounts.step.json @@ -29,7 +29,7 @@ "str:allowance|address:erc20_owner|address:acc1": "400,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "sc:crowdfunding": { "nonce": "0", @@ -39,7 +39,7 @@ "str:deadline": "123,456", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/crowdfunding-erc20.wasm", + "code": "mxsc:../output/crowdfunding-erc20.mxsc.json", "owner": "address:crowdfunding_owner" } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/auction_batch.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/auction_batch.scen.json index 7c9c63eebd..a7aabaa693 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/auction_batch.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/auction_batch.scen.json @@ -85,7 +85,7 @@ "str:balanceOf|sc:marketplace_contract|str:.node_id|biguint:1": "1", "str:balanceOf|sc:marketplace_contract|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../../erc1155/output/erc1155.wasm" + "code": "mxsc:../../erc1155/output/erc1155.mxsc.json" }, "sc:marketplace_contract": { "nonce": "0", @@ -96,7 +96,7 @@ "str:auctionForToken|biguint:1|biguint:2": "u32:4|str:EGLD|biguint:100|u32:2|u16:500|u64:1000|address:creator|u32:0|u64:0|u64:0|u64:0|u64:0", "str:auctionForToken|biguint:1|biguint:3": "u32:4|str:EGLD|biguint:100|u32:2|u16:500|u64:1000|address:creator|u32:0|u64:0|u64:0|u64:0|u64:0" }, - "code": "file:../output/erc1155-marketplace.wasm" + "code": "mxsc:../output/erc1155-marketplace.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/auction_single_token_egld.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/auction_single_token_egld.scen.json index d47e7785e2..5e03948a52 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/auction_single_token_egld.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/auction_single_token_egld.scen.json @@ -85,7 +85,7 @@ "str:balanceOf|sc:marketplace_contract|str:.node_id|biguint:1": "1", "str:balanceOf|sc:marketplace_contract|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../../erc1155/output/erc1155.wasm" + "code": "mxsc:../../erc1155/output/erc1155.mxsc.json" }, "sc:marketplace_contract": { "nonce": "0", @@ -95,7 +95,7 @@ "str:percentageCut": "10", "str:auctionForToken|biguint:1|biguint:2": "u32:4|str:EGLD|biguint:100|u32:2|u16:500|u64:1000|address:creator|u32:0|u64:0|u64:0|u64:0|u64:0" }, - "code": "file:../output/erc1155-marketplace.wasm" + "code": "mxsc:../output/erc1155-marketplace.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_first_egld.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_first_egld.scen.json index d93272a63e..dcbe4d12a3 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_first_egld.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_first_egld.scen.json @@ -82,7 +82,7 @@ "str:balanceOf|sc:marketplace_contract|str:.node_id|biguint:1": "1", "str:balanceOf|sc:marketplace_contract|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../../erc1155/output/erc1155.wasm" + "code": "mxsc:../../erc1155/output/erc1155.mxsc.json" }, "sc:marketplace_contract": { "nonce": "0", @@ -92,7 +92,7 @@ "str:percentageCut": "10", "str:auctionForToken|biguint:1|biguint:2": "u32:4|str:EGLD|biguint:100|u32:2|u16:500|u64:1000|address:creator|biguint:100|address:user1" }, - "code": "file:../output/erc1155-marketplace.wasm" + "code": "mxsc:../output/erc1155-marketplace.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_second_egld.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_second_egld.scen.json index 99e91ec657..232a7b687d 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_second_egld.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_second_egld.scen.json @@ -79,7 +79,7 @@ "str:balanceOf|sc:marketplace_contract|str:.node_id|biguint:1": "1", "str:balanceOf|sc:marketplace_contract|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../../erc1155/output/erc1155.wasm" + "code": "mxsc:../../erc1155/output/erc1155.mxsc.json" }, "sc:marketplace_contract": { "nonce": "0", @@ -89,7 +89,7 @@ "str:percentageCut": "10", "str:auctionForToken|biguint:1|biguint:2": "u32:4|str:EGLD|biguint:100|u32:2|u16:500|u64:1000|address:creator|u32:2|u16:300|address:user2" }, - "code": "file:../output/erc1155-marketplace.wasm" + "code": "mxsc:../output/erc1155-marketplace.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_third_egld.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_third_egld.scen.json index eabb130f07..9df128c7f7 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_third_egld.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/bid_third_egld.scen.json @@ -79,7 +79,7 @@ "str:balanceOf|sc:marketplace_contract|str:.node_id|biguint:1": "1", "str:balanceOf|sc:marketplace_contract|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../../erc1155/output/erc1155.wasm" + "code": "mxsc:../../erc1155/output/erc1155.mxsc.json" }, "sc:marketplace_contract": { "nonce": "0", @@ -89,7 +89,7 @@ "str:percentageCut": "10", "str:auctionForToken|biguint:1|biguint:2": "u32:4|str:EGLD|biguint:100|u32:2|u16:500|u64:1000|address:creator|u32:2|u16:500|address:user1" }, - "code": "file:../output/erc1155-marketplace.wasm" + "code": "mxsc:../output/erc1155-marketplace.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/end_auction.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/end_auction.scen.json index f1c21716a5..95adcc52d5 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/end_auction.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/end_auction.scen.json @@ -83,7 +83,7 @@ "str:balanceOf|address:user1|str:.node_id|biguint:1": "1", "str:balanceOf|address:user1|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../../erc1155/output/erc1155.wasm" + "code": "mxsc:../../erc1155/output/erc1155.mxsc.json" }, "sc:marketplace_contract": { "nonce": "0", @@ -97,7 +97,7 @@ "str:claimableFunds|str:.node_id|nested:str:EGLD": "1", "str:claimableFunds|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155-marketplace.wasm" + "code": "mxsc:../output/erc1155-marketplace.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/setup_accounts.step.json b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/setup_accounts.step.json index 578efb9856..99dd4cdd35 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/setup_accounts.step.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/scenarios/setup_accounts.step.json @@ -46,7 +46,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:1": "1", "str:balanceOf|address:creator|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../../erc1155/output/erc1155.wasm" + "code": "mxsc:../../erc1155/output/erc1155.mxsc.json" }, "sc:marketplace_contract": { "nonce": "0", @@ -55,7 +55,7 @@ "str:tokenOwnershipContractAddress": "sc:ownership_contract", "str:percentageCut": "10" }, - "code": "file:../output/erc1155-marketplace.wasm" + "code": "mxsc:../output/erc1155-marketplace.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_both_types.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_both_types.scen.json index 9307af596f..c889e11b69 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_both_types.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_both_types.scen.json @@ -79,7 +79,7 @@ "str:balanceOf|address:user1|str:.node_id|biguint:2": "2", "str:balanceOf|address:user1|str:.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_both_types_to_sc.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_both_types_to_sc.scen.json index 5792a128d4..ba567e491d 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_both_types_to_sc.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_both_types_to_sc.scen.json @@ -12,7 +12,7 @@ "sc:user_mock": { "nonce": "0", "balance": "0", - "code": "file:../../erc1155-user-mock/output/erc1155-user-mock.wasm" + "code": "mxsc:../../erc1155-user-mock/output/erc1155-user-mock.mxsc.json" } } }, @@ -59,7 +59,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../../erc1155-user-mock/output/erc1155-user-mock.wasm" + "code": "mxsc:../../erc1155-user-mock/output/erc1155-user-mock.mxsc.json" }, "sc:erc1155": { "nonce": "0", @@ -95,7 +95,7 @@ "str:balanceOf|sc:user_mock|str:.node_id|biguint:2": "2", "str:balanceOf|sc:user_mock|str:.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_fungible.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_fungible.scen.json index ab8b087010..02d3a87d47 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_fungible.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_fungible.scen.json @@ -75,7 +75,7 @@ "str:balanceOf|address:user1|str:.node_id|biguint:2": "2", "str:balanceOf|address:user1|str:.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_fungible_to_sc.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_fungible_to_sc.scen.json index 2f278f93ae..c5bea2ba07 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_fungible_to_sc.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_fungible_to_sc.scen.json @@ -12,7 +12,7 @@ "sc:user_mock": { "nonce": "0", "balance": "0", - "code": "file:../../erc1155-user-mock/output/erc1155-user-mock.wasm" + "code": "mxsc:../../erc1155-user-mock/output/erc1155-user-mock.mxsc.json" } } }, @@ -59,7 +59,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../../erc1155-user-mock/output/erc1155-user-mock.wasm" + "code": "mxsc:../../erc1155-user-mock/output/erc1155-user-mock.mxsc.json" }, "sc:erc1155": { "nonce": "0", @@ -91,7 +91,7 @@ "str:balanceOf|sc:user_mock|str:.node_id|biguint:2": "2", "str:balanceOf|sc:user_mock|str:.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_non_fungible.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_non_fungible.scen.json index bb8f407742..162112e700 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_non_fungible.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_non_fungible.scen.json @@ -85,7 +85,7 @@ "str:balanceOf|address:user1|str:.node_id|biguint:2": "2", "str:balanceOf|address:user1|str:.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_non_fungible_to_sc.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_non_fungible_to_sc.scen.json index 409acb7edf..5b35ff20f7 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_non_fungible_to_sc.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/batch_transfer_non_fungible_to_sc.scen.json @@ -12,7 +12,7 @@ "sc:user_mock": { "nonce": "0", "balance": "0", - "code": "file:../../erc1155-user-mock/output/erc1155-user-mock.wasm" + "code": "mxsc:../../erc1155-user-mock/output/erc1155-user-mock.mxsc.json" } } }, @@ -59,7 +59,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../../erc1155-user-mock/output/erc1155-user-mock.wasm" + "code": "mxsc:../../erc1155-user-mock/output/erc1155-user-mock.mxsc.json" }, "sc:erc1155": { "nonce": "0", @@ -101,7 +101,7 @@ "str:balanceOf|sc:user_mock|str:.node_id|biguint:2": "2", "str:balanceOf|sc:user_mock|str:.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/burn_fungible.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/burn_fungible.scen.json index c93861e869..31ac095e68 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/burn_fungible.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/burn_fungible.scen.json @@ -56,7 +56,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:1": "1", "str:balanceOf|address:creator|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/burn_non_fungible.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/burn_non_fungible.scen.json index d908507973..4184594a8f 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/burn_non_fungible.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/burn_non_fungible.scen.json @@ -62,7 +62,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:1": "1", "str:balanceOf|address:creator|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_one_fungible_one_non_fungible.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_one_fungible_one_non_fungible.scen.json index b3f3ce5154..c76b613649 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_one_fungible_one_non_fungible.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_one_fungible_one_non_fungible.scen.json @@ -70,7 +70,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:2": "2", "str:balanceOf|address:creator|str:.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_token_fungible.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_token_fungible.scen.json index 55713d699a..bfada70c14 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_token_fungible.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_token_fungible.scen.json @@ -68,7 +68,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:1": "1", "str:balanceOf|address:creator|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_token_non_fungible.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_token_non_fungible.scen.json index 7b57f4c64c..2f084c8d72 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_token_non_fungible.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_token_non_fungible.scen.json @@ -74,7 +74,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:1": "1", "str:balanceOf|address:creator|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_fungible_different_creator.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_fungible_different_creator.scen.json index ca1b77eb20..475cfd9ab6 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_fungible_different_creator.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_fungible_different_creator.scen.json @@ -81,7 +81,7 @@ "str:balanceOf|address:second_creator|str:.node_id|biguint:2": "1", "str:balanceOf|address:second_creator|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_fungible_same_creator.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_fungible_same_creator.scen.json index dd353d8b0a..4a6749418c 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_fungible_same_creator.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_fungible_same_creator.scen.json @@ -66,7 +66,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:2": "2", "str:balanceOf|address:creator|str:.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_non_fungible_same_creator.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_non_fungible_same_creator.scen.json index 7c5d3c5c43..85adbbb4cf 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_non_fungible_same_creator.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/create_two_tokens_both_non_fungible_same_creator.scen.json @@ -76,7 +76,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:2": "2", "str:balanceOf|address:creator|str:.info": "u32:2|u32:1|u32:2|u32:2" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/deploy.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/deploy.scen.json index 8b9ac37974..6ec4932c4e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/deploy.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/deploy.scen.json @@ -49,7 +49,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_fungible.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_fungible.scen.json index 0435769bdf..2112507044 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_fungible.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_fungible.scen.json @@ -56,7 +56,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:1": "1", "str:balanceOf|address:creator|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_non_fungible.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_non_fungible.scen.json index dc0e775d35..a584085a0e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_non_fungible.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_non_fungible.scen.json @@ -65,7 +65,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:1": "1", "str:balanceOf|address:creator|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_not_creator.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_not_creator.scen.json index 8cbaeaedb0..78d5ef6aa1 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_not_creator.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/mint_not_creator.scen.json @@ -56,7 +56,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:1": "1", "str:balanceOf|address:creator|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_not_enough_balance.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_not_enough_balance.scen.json index 6fbbc3d169..b54cedf388 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_not_enough_balance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_not_enough_balance.scen.json @@ -59,7 +59,7 @@ "str:balanceOf|address:creator|str:.node_id|biguint:1": "1", "str:balanceOf|address:creator|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_ok.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_ok.scen.json index c28a98bd30..983cd0b827 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_ok.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_ok.scen.json @@ -64,7 +64,7 @@ "str:balanceOf|address:user1|str:.node_id|biguint:1": "1", "str:balanceOf|address:user1|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_ok_to_sc.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_ok_to_sc.scen.json index 84ffd8ccc2..c75b26a736 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_ok_to_sc.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_fungible_ok_to_sc.scen.json @@ -12,7 +12,7 @@ "sc:user_mock": { "nonce": "0", "balance": "0", - "code": "file:../../erc1155-user-mock/output/erc1155-user-mock.wasm" + "code": "mxsc:../../erc1155-user-mock/output/erc1155-user-mock.mxsc.json" } } }, @@ -59,7 +59,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../../erc1155-user-mock/output/erc1155-user-mock.wasm" + "code": "mxsc:../../erc1155-user-mock/output/erc1155-user-mock.mxsc.json" }, "sc:erc1155": { "nonce": "0", @@ -80,7 +80,7 @@ "str:balanceOf|sc:user_mock|str:.node_id|biguint:1": "1", "str:balanceOf|sc:user_mock|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_non_fungible_ok.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_non_fungible_ok.scen.json index eaba1aa2f6..71c57fdbb4 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_non_fungible_ok.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_non_fungible_ok.scen.json @@ -70,7 +70,7 @@ "str:balanceOf|address:user1|str:.node_id|biguint:1": "1", "str:balanceOf|address:user1|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_non_fungible_ok_to_sc.scen.json b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_non_fungible_ok_to_sc.scen.json index ab588567f2..a18648e788 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_non_fungible_ok_to_sc.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc1155/scenarios/transfer_non_fungible_ok_to_sc.scen.json @@ -12,7 +12,7 @@ "sc:user_mock": { "nonce": "0", "balance": "0", - "code": "file:../../erc1155-user-mock/output/erc1155-user-mock.wasm" + "code": "mxsc:../../erc1155-user-mock/output/erc1155-user-mock.mxsc.json" } } }, @@ -59,7 +59,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../../erc1155-user-mock/output/erc1155-user-mock.wasm" + "code": "mxsc:../../erc1155-user-mock/output/erc1155-user-mock.mxsc.json" }, "sc:erc1155": { "nonce": "0", @@ -86,7 +86,7 @@ "str:balanceOf|sc:user_mock|str:.node_id|biguint:1": "1", "str:balanceOf|sc:user_mock|str:.info": "u32:1|u32:1|u32:1|u32:1" }, - "code": "file:../output/erc1155.wasm" + "code": "mxsc:../output/erc1155.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_CallerCaller.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_CallerCaller.scen.json index 4d1bf9660a..9ba4dda1e5 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_CallerCaller.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_CallerCaller.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_CallerOther.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_CallerOther.scen.json index c0863dc955..b1bab22b4d 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_CallerOther.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_CallerOther.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherCaller.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherCaller.scen.json index 1517866069..8df986c1e7 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherCaller.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherCaller.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherEqOther.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherEqOther.scen.json index 38cb8516b4..5e1e4be875 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherEqOther.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherEqOther.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherNEqOther.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherNEqOther.scen.json index 1e46287e35..40600f4724 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherNEqOther.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/allowance_OtherNEqOther.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Caller-Positive.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Caller-Positive.scen.json index 3e5f988aa2..b2b31ae460 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Caller-Positive.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Caller-Positive.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -70,7 +70,7 @@ "str:allowance|address:account_1|address:account_1": "0x25", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Caller-Zero.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Caller-Zero.scen.json index 14061d192c..28eafe1d53 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Caller-Zero.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Caller-Zero.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -69,7 +69,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Other-Positive.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Other-Positive.scen.json index cbf0eabe8b..286e992254 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Other-Positive.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Other-Positive.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -70,7 +70,7 @@ "str:allowance|address:account_1|address:account_2": "0x2a", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Other-Zero.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Other-Zero.scen.json index d3f9240b0d..fba77ec22c 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Other-Zero.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_Other-Zero.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -69,7 +69,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_SwitchCaller.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_SwitchCaller.scen.json index 2f319fbb2d..b118442922 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_SwitchCaller.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/approve_SwitchCaller.scen.json @@ -20,7 +20,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -128,7 +128,7 @@ "str:allowance|0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1000000000000000000000000|address:account_1": "0x19", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/balanceOf_Caller.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/balanceOf_Caller.scen.json index def7c4474e..4e5b368bda 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/balanceOf_Caller.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/balanceOf_Caller.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -59,7 +59,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/balanceOf_NonCaller.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/balanceOf_NonCaller.scen.json index afd628753c..5ca8fff453 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/balanceOf_NonCaller.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/balanceOf_NonCaller.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -59,7 +59,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/not_payable.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/not_payable.scen.json index c4d038992e..25eedd8c02 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/not_payable.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/not_payable.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -177,7 +177,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/not_payable_esdt.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/not_payable_esdt.scen.json index 03cbe22533..7dff3dc600 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/not_payable_esdt.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/not_payable_esdt.scen.json @@ -19,7 +19,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -213,7 +213,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/totalSupply_Positive.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/totalSupply_Positive.scen.json index 2a4570c650..d946947e50 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/totalSupply_Positive.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/totalSupply_Positive.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -57,7 +57,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/totalSupply_Zero.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/totalSupply_Zero.scen.json index 2877139c74..8dd522c405 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/totalSupply_Zero.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/totalSupply_Zero.scen.json @@ -12,7 +12,7 @@ "sc:erc20": { "nonce": "0", "balance": "0", - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -50,7 +50,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-BalanceEqAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-BalanceEqAllowance.scen.json index 43d20b4518..508dfb1c31 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-BalanceEqAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-BalanceEqAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -73,7 +73,7 @@ "str:balance|address:coin_holder_2": "0x17", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-BalanceNEqAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-BalanceNEqAllowance.scen.json index 0b0d3f7151..f4de876cd4 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-BalanceNEqAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-BalanceNEqAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -73,7 +73,7 @@ "str:balance|address:coin_holder_2": "0x17", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireAllowanceMoreThanBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireAllowanceMoreThanBalance.scen.json index 381bec1bbc..6507bc4089 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireAllowanceMoreThanBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireAllowanceMoreThanBalance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireBalanceEqAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireBalanceEqAllowance.scen.json index df774e506c..5e7635cc93 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireBalanceEqAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireBalanceEqAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -71,7 +71,7 @@ "str:balance|address:coin_holder_2": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireBalanceMoreThanAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireBalanceMoreThanAllowance.scen.json index 8f6d15eeb4..39fc9fac7e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireBalanceMoreThanAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-EntireBalanceMoreThanAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-MoreThanAllowanceLessThanBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-MoreThanAllowanceLessThanBalance.scen.json index 24bfb5d26b..f0a53df528 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-MoreThanAllowanceLessThanBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-MoreThanAllowanceLessThanBalance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-MoreThanBalanceLessThanAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-MoreThanBalanceLessThanAllowance.scen.json index 7b09e95135..7e4e12ee4c 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-MoreThanBalanceLessThanAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-MoreThanBalanceLessThanAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-NoOverflow.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-NoOverflow.scen.json index 3cb66650ec..88c8cc1749 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-NoOverflow.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-NoOverflow.scen.json @@ -18,7 +18,7 @@ "str:balance|address:account_2": "0x0a", "str:totalSupply": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -72,7 +72,7 @@ "str:balance|address:account_2": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "str:totalSupply": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-StillNoOverflow.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-StillNoOverflow.scen.json index 4760d104fa..b91ffba31d 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-StillNoOverflow.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllDistinct-StillNoOverflow.scen.json @@ -18,7 +18,7 @@ "str:balance|address:account_2": "0x0a", "str:totalSupply": "0x010000000000000000000000000000000000000000000000000000000000000000" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -72,7 +72,7 @@ "str:balance|address:account_2": "0x010000000000000000000000000000000000000000000000000000000000000000", "str:totalSupply": "0x010000000000000000000000000000000000000000000000000000000000000000" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllEqual-AllowanceRelevant.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllEqual-AllowanceRelevant.scen.json index ff98e445f2..3f197e8eec 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllEqual-AllowanceRelevant.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllEqual-AllowanceRelevant.scen.json @@ -17,7 +17,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllEqual-EntireBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllEqual-EntireBalance.scen.json index da498cbcae..31443ff69f 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllEqual-EntireBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_AllEqual-EntireBalance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -71,7 +71,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-AllowanceRelevant.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-AllowanceRelevant.scen.json index 3a2fa29249..7e92e9878b 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-AllowanceRelevant.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-AllowanceRelevant.scen.json @@ -17,7 +17,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-EntireBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-EntireBalance.scen.json index 7dd46751db..6f1baff093 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-EntireBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-EntireBalance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -71,7 +71,7 @@ "str:balance|address:account_7": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-MoreThanBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-MoreThanBalance.scen.json index 6758bc2ea3..b03c17a89c 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-MoreThanBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqFrom-MoreThanBalance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-BalanceNEqAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-BalanceNEqAllowance.scen.json index 2230177227..8d521578a2 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-BalanceNEqAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-BalanceNEqAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -73,7 +73,7 @@ "str:balance|address:account_1": "0x17", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-MoreThanAllowanceLessThanBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-MoreThanAllowanceLessThanBalance.scen.json index 8a2db2655c..40dabff5d4 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-MoreThanAllowanceLessThanBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-MoreThanAllowanceLessThanBalance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-MoreThanBalanceLessThanAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-MoreThanBalanceLessThanAllowance.scen.json index 63c7b9ca6f..b4015515b1 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-MoreThanBalanceLessThanAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_CallerEqTo-MoreThanBalanceLessThanAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_Exploratory-MultipleTransfersSucceed.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_Exploratory-MultipleTransfersSucceed.scen.json index a3459b5568..0fcc47c1a5 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_Exploratory-MultipleTransfersSucceed.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_Exploratory-MultipleTransfersSucceed.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -176,7 +176,7 @@ "str:balance|address:account_1": "0x0a", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_Exploratory-MultipleTransfersThrow.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_Exploratory-MultipleTransfersThrow.scen.json index 4723df7702..a1e6553086 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_Exploratory-MultipleTransfersThrow.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_Exploratory-MultipleTransfersThrow.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -166,7 +166,7 @@ "str:balance|address:account_6": "0x0a", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-BalanceEqAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-BalanceEqAllowance.scen.json index 2a18e14207..ab21e0dd73 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-BalanceEqAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-BalanceEqAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -72,7 +72,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-BalanceNEqAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-BalanceNEqAllowance.scen.json index 0604d015c2..10c448a808 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-BalanceNEqAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-BalanceNEqAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -72,7 +72,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireAllowanceMoreThanBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireAllowanceMoreThanBalance.scen.json index a7c68f3a79..d13fcd283e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireAllowanceMoreThanBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireAllowanceMoreThanBalance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireBalanceEqAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireBalanceEqAllowance.scen.json index 1a1e95799c..339650315d 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireBalanceEqAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireBalanceEqAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -71,7 +71,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireBalanceMoreThanAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireBalanceMoreThanAllowance.scen.json index 464581b9b8..7f19c1145b 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireBalanceMoreThanAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-EntireBalanceMoreThanAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-MoreThanAllowanceLessThanBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-MoreThanAllowanceLessThanBalance.scen.json index 3b8f980186..95325597b6 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-MoreThanAllowanceLessThanBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-MoreThanAllowanceLessThanBalance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-MoreThanBalanceLessThanAllowance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-MoreThanBalanceLessThanAllowance.scen.json index e48e51e4f7..b71feb7885 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-MoreThanBalanceLessThanAllowance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-MoreThanBalanceLessThanAllowance.scen.json @@ -17,7 +17,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -62,7 +62,7 @@ "str:balance|address:coin_holder_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-NoOverflow.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-NoOverflow.scen.json index 74ef4842ad..5a5f6b9f5b 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-NoOverflow.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transferFrom_FromEqTo-NoOverflow.scen.json @@ -18,7 +18,7 @@ "str:balance|address:account_2": "0x0a", "str:totalSupply": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -72,7 +72,7 @@ "str:balance|address:account_2": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "str:totalSupply": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-AllowanceIrrelevant.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-AllowanceIrrelevant.scen.json index 2cebe6f23e..414fde1c7b 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-AllowanceIrrelevant.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-AllowanceIrrelevant.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -103,7 +103,7 @@ "str:allowance|address:account_1|address:account_1": "0x14", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-EntireBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-EntireBalance.scen.json index 979c0cb95e..dc307dc625 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-EntireBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-EntireBalance.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -69,7 +69,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-MoreThanBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-MoreThanBalance.scen.json index 0b52e75810..47308147c8 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-MoreThanBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-MoreThanBalance.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -59,7 +59,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-NoOverflow.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-NoOverflow.scen.json index dae9f61eed..ce6250369b 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-NoOverflow.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-NoOverflow.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5", "str:totalSupply": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -69,7 +69,7 @@ "str:balance|address:account_1": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5", "str:totalSupply": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-Positive.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-Positive.scen.json index 519e664665..5067620eab 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-Positive.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-Positive.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -69,7 +69,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-StillNoOverflow.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-StillNoOverflow.scen.json index d8ec5a8371..2be9cf3163 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-StillNoOverflow.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-StillNoOverflow.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5", "str:totalSupply": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -69,7 +69,7 @@ "str:balance|address:account_1": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5", "str:totalSupply": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-Zero.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-Zero.scen.json index f53b5773e6..edfabbd9aa 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-Zero.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Caller-Zero.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -69,7 +69,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-AllowanceIrrelevant.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-AllowanceIrrelevant.scen.json index ccef21f2e7..04a205a029 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-AllowanceIrrelevant.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-AllowanceIrrelevant.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -104,7 +104,7 @@ "str:allowance|address:account_1|address:account_1": "0x14", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-EntireBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-EntireBalance.scen.json index e60ece815d..cb0193275a 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-EntireBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-EntireBalance.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -69,7 +69,7 @@ "str:balance|address:account_7": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-MoreThanBalance.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-MoreThanBalance.scen.json index c0f6ead594..d8356178a0 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-MoreThanBalance.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-MoreThanBalance.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -59,7 +59,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-NoOverflow.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-NoOverflow.scen.json index e79a16b66d..10d2e24e83 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-NoOverflow.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-NoOverflow.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "str:totalSupply": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -69,7 +69,7 @@ "str:balance|address:account_2": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "str:totalSupply": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-Positive.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-Positive.scen.json index 4b35010b52..8427e142dc 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-Positive.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-Positive.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -70,7 +70,7 @@ "str:balance|address:account_7": "0x17", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-StillNoOverflow.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-StillNoOverflow.scen.json index c709e03502..2b72e40444 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-StillNoOverflow.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-StillNoOverflow.scen.json @@ -17,7 +17,7 @@ "str:balance|address:account_2": "0x0a", "str:totalSupply": "0x010000000000000000000000000000000000000000000000000000000000000009" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -71,7 +71,7 @@ "str:balance|address:account_2": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", "str:totalSupply": "0x010000000000000000000000000000000000000000000000000000000000000009" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-Zero.scen.json b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-Zero.scen.json index 2d703784d9..ca95e12d0a 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-Zero.scen.json +++ b/contracts/feature-tests/erc-style-contracts/erc20/scenarios/transfer_Other-Zero.scen.json @@ -16,7 +16,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } }, @@ -69,7 +69,7 @@ "str:balance|address:account_1": "0x2710", "str:totalSupply": "0x2710" }, - "code": "file:../output/erc20.wasm" + "code": "mxsc:../output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-all-tickets-different-accounts.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-all-tickets-different-accounts.scen.json index 8d079bc3f3..e65250c952 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-all-tickets-different-accounts.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-all-tickets-different-accounts.scen.json @@ -166,7 +166,7 @@ "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc4": "1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc5": "1" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -187,7 +187,7 @@ "str:allowance|address:acc5|sc:lottery": "0", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-more-tickets-than-allowed.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-more-tickets-than-allowed.scen.json index c5adb71323..cdad8b3340 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-more-tickets-than-allowed.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-more-tickets-than-allowed.scen.json @@ -55,7 +55,7 @@ "str:ticketHolder|u32:12|str:lottery_name|0x00000000": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -70,7 +70,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-deadline.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-deadline.scen.json index 0c45bcec88..c4257d6641 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-deadline.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-deadline.scen.json @@ -61,7 +61,7 @@ "str:ticketHolder|u32:12|str:lottery_name|0x00000000": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -76,7 +76,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-determined-winner.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-determined-winner.scen.json index ad4093baf4..24fd2bd922 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-determined-winner.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-determined-winner.scen.json @@ -52,7 +52,7 @@ "storage": { "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -67,7 +67,7 @@ "str:allowance|address:acc2|sc:lottery": "0", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-sold-out.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-sold-out.scen.json index 2ba3880e43..87138b242a 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-sold-out.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-after-sold-out.scen.json @@ -57,7 +57,7 @@ "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc2": "1" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -72,7 +72,7 @@ "str:allowance|address:acc2|sc:lottery": "0", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-all-options.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-all-options.scen.json index aa53e3b0e1..92a3d063b6 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-all-options.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-all-options.scen.json @@ -59,7 +59,7 @@ "str:ticketHolder|u32:12|str:lottery_name|0x00000000": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -74,7 +74,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-another-account.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-another-account.scen.json index 2dc60a6728..b2a98989fd 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-another-account.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-another-account.scen.json @@ -57,7 +57,7 @@ "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc2": "1" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -72,7 +72,7 @@ "str:allowance|address:acc2|sc:lottery": "0", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-not-on-whitelist.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-not-on-whitelist.scen.json index 9842ac2b57..1d30a31608 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-not-on-whitelist.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-not-on-whitelist.scen.json @@ -71,7 +71,7 @@ "str:lotteryInfo|u32:12|str:lottery_name": "u32:1|u8:100|u32:5|u64:123,456|u32:1|u32:2|u8:75|u8:25|u32:3|address:my_address|address:acc1|address:acc2|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -86,7 +86,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-same-account.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-same-account.scen.json index 6cb1dbc6bd..aae36fe803 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-same-account.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-same-account.scen.json @@ -26,7 +26,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" } } }, @@ -80,7 +80,7 @@ "str:ticketHolder|u32:12|str:lottery_name|0x00000001": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "2" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -95,7 +95,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-second-lottery.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-second-lottery.scen.json index 1bd6b68dcd..413a3aaec9 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-second-lottery.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-second-lottery.scen.json @@ -22,7 +22,7 @@ "str:allowance|address:acc2|sc:lottery": "500", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" } } }, @@ -76,7 +76,7 @@ "str:numberOfEntriesForUser|u32:12|str:lottery_$$$$|address:acc1": "1", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -91,7 +91,7 @@ "str:allowance|address:acc2|sc:lottery": "500", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-wrong-fee.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-wrong-fee.scen.json index f814172379..9b82802818 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-wrong-fee.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket-wrong-fee.scen.json @@ -57,7 +57,7 @@ "str:lotteryInfo|u32:12|str:lottery_name": "u32:1|u8:100|u32:2|u64:123,456|0xffffffff|u32:1|u8:100|u32:0|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -72,7 +72,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket.scen.json index f325574f2b..1aba3bb501 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/buy-ticket.scen.json @@ -59,7 +59,7 @@ "str:ticketHolder|u32:12|str:lottery_name|0x00000000": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -74,7 +74,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-different-ticket-holders-winner-acc1.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-different-ticket-holders-winner-acc1.scen.json index be7b2b5154..1f88545ca3 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-different-ticket-holders-winner-acc1.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-different-ticket-holders-winner-acc1.scen.json @@ -57,7 +57,7 @@ "storage": { "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -72,7 +72,7 @@ "str:allowance|address:acc2|sc:lottery": "0", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-early.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-early.scen.json index 07ca32d472..2630144d6f 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-early.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-early.scen.json @@ -82,7 +82,7 @@ "str:ticketHolder|u32:12|str:lottery_name|0x00000000": "address:acc1", "str:numberOfEntriesForUser|u32:12|str:lottery_name|address:acc1": "1" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -97,7 +97,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-same-ticket-holder.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-same-ticket-holder.scen.json index 5df68da73f..b9ba9a97b0 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-same-ticket-holder.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-same-ticket-holder.scen.json @@ -58,7 +58,7 @@ "storage": { "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -73,7 +73,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-split-prize-pool.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-split-prize-pool.scen.json index cf11e576ad..057240aa0e 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-split-prize-pool.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/determine-winner-split-prize-pool.scen.json @@ -73,7 +73,7 @@ "storage": { "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -94,7 +94,7 @@ "str:allowance|address:acc5|sc:lottery": "0", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/lottery-init.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/lottery-init.scen.json index d70cbc7388..5227e64a56 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/lottery-init.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/lottery-init.scen.json @@ -84,7 +84,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" } } }, @@ -137,7 +137,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "sc:lottery": { "nonce": "0", @@ -145,7 +145,7 @@ "storage": { "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/set_accounts.step.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/set_accounts.step.json index 336e69558e..9189e68076 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/set_accounts.step.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/set_accounts.step.json @@ -17,7 +17,7 @@ "str:allowance|address:acc2|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-after-announced-winner.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-after-announced-winner.scen.json index d5099fefa9..fdb26597bc 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-after-announced-winner.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-after-announced-winner.scen.json @@ -57,7 +57,7 @@ "str:lotteryInfo|u32:12|str:lottery_name": "u32:2|u16:1000|u32:200|u64:12345678905|0xffffffff|u32:1|u8:100|u32:0|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -72,7 +72,7 @@ "str:allowance|address:acc2|sc:lottery": "0", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-all-options-bigger-whitelist.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-all-options-bigger-whitelist.scen.json index 4a5a9a01d0..946133dd65 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-all-options-bigger-whitelist.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-all-options-bigger-whitelist.scen.json @@ -66,7 +66,7 @@ "str:allowance|address:acc5|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" } } }, @@ -115,7 +115,7 @@ "str:lotteryInfo|u32:12|str:lottery_name": "u32:1|u8:100|u32:5|u64:123,456|u32:1|u32:2|u8:75|u8:25|u32:5|address:acc1|address:acc2|address:acc3|address:acc4|address:acc5|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -136,7 +136,7 @@ "str:allowance|address:acc5|sc:lottery": "100", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" } } } diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-alternative-function-name.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-alternative-function-name.scen.json index 99b9f6a0fa..46aec3f557 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-alternative-function-name.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-alternative-function-name.scen.json @@ -57,7 +57,7 @@ "str:lotteryInfo|u32:12|str:lottery_name": "u32:1|u8:100|0xffffffff|u64:2592000|0xffffffff|u32:1|u8:100|u32:0|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -66,7 +66,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-fixed-deadline.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-fixed-deadline.scen.json index 5e9cfd0490..ae7c4bccbd 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-fixed-deadline.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-fixed-deadline.scen.json @@ -57,7 +57,7 @@ "str:lotteryInfo|u32:12|str:lottery_name": "u32:1|u8:100|0xffffffff|u64:123,456|0xffffffff|u32:1|u8:100|u32:0|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -66,7 +66,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline-invalid-deadline.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline-invalid-deadline.scen.json index 0cd83bee78..92af03d64f 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline-invalid-deadline.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline-invalid-deadline.scen.json @@ -63,7 +63,7 @@ "storage": { "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -72,7 +72,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline-invalid-ticket-price-arg.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline-invalid-ticket-price-arg.scen.json index f9dd74e661..7369b6102d 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline-invalid-ticket-price-arg.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline-invalid-ticket-price-arg.scen.json @@ -57,7 +57,7 @@ "storage": { "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -66,7 +66,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline.scen.json index d43bc14b1d..1b77fb4c97 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets-and-fixed-deadline.scen.json @@ -57,7 +57,7 @@ "str:lotteryInfo|u32:12|str:lottery_name": "u32:1|u8:100|u32:2|u64:123,456|0xffffffff|u32:1|u8:100|u32:0|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -66,7 +66,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets.scen.json index 885d9ef690..d440184874 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-limited-tickets.scen.json @@ -57,7 +57,7 @@ "str:lotteryInfo|u32:12|str:lottery_name": "u32:1|u8:100|u32:2|u64:2592000|0xffffffff|u32:1|u8:100|u32:0|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -66,7 +66,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-second-lottery.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-second-lottery.scen.json index b466461039..791b092a91 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-second-lottery.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-second-lottery.scen.json @@ -58,7 +58,7 @@ "str:lotteryInfo|u32:12|str:lottery_$$$$": "u32:2|u16:500|u32:5|u64:234,567|0xffffffff|u32:1|u8:100|u32:0|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -67,7 +67,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-with-all-options.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-with-all-options.scen.json index 272731c298..e07c4b9e1d 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-with-all-options.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-with-all-options.scen.json @@ -57,7 +57,7 @@ "str:lotteryInfo|u32:12|str:lottery_name": "u32:1|u8:100|u32:5|u64:123,456|u32:1|u32:2|u8:75|u8:25|u32:3|address:my_address|address:acc1|address:acc2|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -66,7 +66,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-with-no-options.scen.json b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-with-no-options.scen.json index 13de631c4b..b32fbbe911 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-with-no-options.scen.json +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/scenarios/start-with-no-options.scen.json @@ -57,7 +57,7 @@ "str:lotteryInfo|u32:12|str:lottery_name": "u32:1|u8:100|0xffffffff|u64:2592000|0xffffffff|u32:1|u8:100|u32:0|u32:0|u32:0|u32:0", "str:erc20ContractAddress": "sc:erc20" }, - "code": "file:../output/lottery-erc20.wasm" + "code": "mxsc:../output/lottery-erc20.mxsc.json" }, "sc:erc20": { "nonce": "0", @@ -66,7 +66,7 @@ "str:balance|address:erc20_owner": "1,000,000,000", "str:totalSupply": "1,000,000,000" }, - "code": "file:../../erc20/output/erc20.wasm" + "code": "mxsc:../../erc20/output/erc20.mxsc.json" }, "address:erc20_owner": { "nonce": "1", diff --git a/contracts/feature-tests/esdt-system-sc-mock/scenarios/esdt_system_sc.scen.json b/contracts/feature-tests/esdt-system-sc-mock/scenarios/esdt_system_sc.scen.json index 1b2fa7de9c..b9a8fcd246 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/scenarios/esdt_system_sc.scen.json +++ b/contracts/feature-tests/esdt-system-sc-mock/scenarios/esdt_system_sc.scen.json @@ -18,7 +18,7 @@ ] } }, - "code": "file:../output/esdt-system-sc-mock.wasm" + "code": "mxsc:../output/esdt-system-sc-mock.mxsc.json" } } }, @@ -96,7 +96,7 @@ "storage": { "str:nrIssuedTokens": "1" }, - "code": "file:../output/esdt-system-sc-mock.wasm" + "code": "mxsc:../output/esdt-system-sc-mock.mxsc.json" } } }, diff --git a/contracts/feature-tests/formatted-message-features/scenarios/managed_error_message.scen.json b/contracts/feature-tests/formatted-message-features/scenarios/managed_error_message.scen.json index 73ea4f4993..b46ba345b5 100644 --- a/contracts/feature-tests/formatted-message-features/scenarios/managed_error_message.scen.json +++ b/contracts/feature-tests/formatted-message-features/scenarios/managed_error_message.scen.json @@ -6,7 +6,7 @@ "sc:msg-features": { "nonce": "0", "balance": "0", - "code": "file:../output/formatted-message-features.wasm" + "code": "mxsc:../output/formatted-message-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/formatted-message-features/scenarios/sc_format.scen.json b/contracts/feature-tests/formatted-message-features/scenarios/sc_format.scen.json index fb9e51f407..d83881d973 100644 --- a/contracts/feature-tests/formatted-message-features/scenarios/sc_format.scen.json +++ b/contracts/feature-tests/formatted-message-features/scenarios/sc_format.scen.json @@ -6,7 +6,7 @@ "sc:msg-features": { "nonce": "0", "balance": "0", - "code": "file:../output/formatted-message-features.wasm" + "code": "mxsc:../output/formatted-message-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/balanceOf.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/balanceOf.scen.json index 359a8e86e1..cdc526ee34 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/balanceOf.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/balanceOf.scen.json @@ -15,7 +15,7 @@ "storage": { "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -84,7 +84,7 @@ "storage": { "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "2", diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/create.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/create.scen.json index b9e4892029..ae48856e80 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/create.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/create.scen.json @@ -49,7 +49,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" } } } diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/exceptions.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/exceptions.scen.json index e38dcdab94..3290b14e18 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/exceptions.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/exceptions.scen.json @@ -12,7 +12,7 @@ "sc:crypto_bubbles_legacy": { "nonce": "0", "balance": "0x1300", - "code": "file:../output/crypto-bubbles-legacy.wasm", + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json", "owner": "address:crypto_bubbles_owner" } } @@ -76,7 +76,7 @@ "nonce": "0", "balance": "0x1300", "storage": {}, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" } } } diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/joinGame.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/joinGame.scen.json index cd29d4101d..6c74a96080 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/joinGame.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/joinGame.scen.json @@ -16,7 +16,7 @@ "str:playerBalance|address:acc1": "0x311", "str:playerBalance|address:acc2": "0x422" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -170,7 +170,7 @@ "str:playerBalance|address:acc1": "0x311", "str:playerBalance|address:acc2": "0x422" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardAndSendToWallet.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardAndSendToWallet.scen.json index 00de92224f..4d3130c5be 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardAndSendToWallet.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardAndSendToWallet.scen.json @@ -16,7 +16,7 @@ "str:playerBalance|address:acc1": "0x100", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm", + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json", "owner": "address:crypto_bubbles_owner" }, "address:acc1": { @@ -94,7 +94,7 @@ "str:playerBalance|address:acc1": "0x100", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "0", diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardWinner.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardWinner.scen.json index cce706f596..8c82957e9a 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardWinner.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardWinner.scen.json @@ -16,7 +16,7 @@ "str:playerBalance|address:acc1": "0x100", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm", + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json", "owner": "address:crypto_bubbles_owner" } } @@ -71,7 +71,7 @@ "str:playerBalance|address:acc1": "0x300", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" } } } diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardWinner_Last.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardWinner_Last.scen.json index e48e356079..6bd6db0d30 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardWinner_Last.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/rewardWinner_Last.scen.json @@ -16,7 +16,7 @@ "str:playerBalance|address:acc1": "0x100", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm", + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json", "owner": "address:crypto_bubbles_owner" } } @@ -71,7 +71,7 @@ "str:playerBalance|address:acc1": "0x1100", "str:playerBalance|address:acc2": "0x0100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" } } } diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/topUp_ok.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/topUp_ok.scen.json index 1864c8fa7d..feb056b01e 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/topUp_ok.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/topUp_ok.scen.json @@ -12,7 +12,7 @@ "sc:crypto_bubbles_legacy": { "nonce": "0", "balance": "0", - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -100,7 +100,7 @@ "str:playerBalance|address:acc1": "0x100", "str:playerBalance|address:acc2": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/topUp_withdraw.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/topUp_withdraw.scen.json index 8b2dbdbae8..5f117595db 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/topUp_withdraw.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/topUp_withdraw.scen.json @@ -12,7 +12,7 @@ "sc:crypto_bubbles_legacy": { "nonce": "0", "balance": "0", - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -104,7 +104,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "2", diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/withdraw_Ok.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/withdraw_Ok.scen.json index b02b76a5f9..4e09265d10 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/withdraw_Ok.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/withdraw_Ok.scen.json @@ -15,7 +15,7 @@ "storage": { "str:playerBalance|address:acc1": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -79,7 +79,7 @@ "storage": { "str:playerBalance|address:acc1": "0xf0" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/withdraw_TooMuch.scen.json b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/withdraw_TooMuch.scen.json index d0c8b45347..ec253d9891 100644 --- a/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/withdraw_TooMuch.scen.json +++ b/contracts/feature-tests/legacy-examples/crypto-bubbles-legacy/scenarios/withdraw_TooMuch.scen.json @@ -15,7 +15,7 @@ "storage": { "str:playerBalance|address:acc1": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "0", @@ -60,7 +60,7 @@ "storage": { "str:playerBalance|address:acc1": "0x100" }, - "code": "file:../output/crypto-bubbles-legacy.wasm" + "code": "mxsc:../output/crypto-bubbles-legacy.mxsc.json" }, "address:acc1": { "nonce": "1", diff --git a/contracts/feature-tests/managed-map-features/scenarios/mmap_get.scen.json b/contracts/feature-tests/managed-map-features/scenarios/mmap_get.scen.json index bb1c10f4d2..56fc9732bd 100644 --- a/contracts/feature-tests/managed-map-features/scenarios/mmap_get.scen.json +++ b/contracts/feature-tests/managed-map-features/scenarios/mmap_get.scen.json @@ -6,7 +6,7 @@ "sc:mmap-features": { "nonce": "0", "balance": "0", - "code": "file:../output/managed-map-features.wasm", + "code": "mxsc:../output/managed-map-features.mxsc.json", "storage": { "str:num_entries": "3", "str:key|u32:0": "str:key0", diff --git a/contracts/feature-tests/managed-map-features/scenarios/mmap_remove.scen.json b/contracts/feature-tests/managed-map-features/scenarios/mmap_remove.scen.json index f7cab94825..41d68ec9bc 100644 --- a/contracts/feature-tests/managed-map-features/scenarios/mmap_remove.scen.json +++ b/contracts/feature-tests/managed-map-features/scenarios/mmap_remove.scen.json @@ -6,7 +6,7 @@ "sc:mmap-features": { "nonce": "0", "balance": "0", - "code": "file:../output/managed-map-features.wasm", + "code": "mxsc:../output/managed-map-features.mxsc.json", "storage": { "str:num_entries": "4", "str:key|u32:0": "str:key0", diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-example-feature.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-example-feature.scen.json index 614b40b11b..1faa8e338e 100644 --- a/contracts/feature-tests/multi-contract-features/scenarios/mcf-example-feature.scen.json +++ b/contracts/feature-tests/multi-contract-features/scenarios/mcf-example-feature.scen.json @@ -4,10 +4,10 @@ "step": "setState", "accounts": { "sc:mcf": { - "code": "file:../output/multi-contract-features.wasm" + "code": "mxsc:../output/multi-contract-features.mxsc.json" }, "sc:mcf-example-feature": { - "code": "file:../output/multi-contract-example-feature.wasm" + "code": "mxsc:../output/multi-contract-example-feature.mxsc.json" }, "address:owner": {} } diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-get.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-get.scen.json index 40362f1626..4ab9b161d8 100644 --- a/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-get.scen.json +++ b/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-get.scen.json @@ -67,7 +67,7 @@ "storage": { "str:sample-value": "123" }, - "code": "file:../output/multi-contract-features.wasm" + "code": "mxsc:../output/multi-contract-features.mxsc.json" }, "sc:mcf-view": { "nonce": "0", @@ -75,7 +75,7 @@ "storage": { "str:external-view-target-address": "sc:mcf" }, - "code": "file:../output/multi-contract-features-view.wasm" + "code": "mxsc:../output/multi-contract-features-view.mxsc.json" }, "address:owner": { "nonce": "*" @@ -108,7 +108,7 @@ "storage": { "str:sample-value": "123" }, - "code": "file:../output/multi-contract-features.wasm" + "code": "mxsc:../output/multi-contract-features.mxsc.json" }, "sc:mcf-view": { "nonce": "0", @@ -117,7 +117,7 @@ "str:sample-value": "567", "str:external-view-target-address": "sc:mcf" }, - "code": "file:../output/multi-contract-features-view.wasm" + "code": "mxsc:../output/multi-contract-features-view.mxsc.json" }, "address:owner": { "nonce": "*" diff --git a/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-pure.scen.json b/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-pure.scen.json index ec9b98dbd6..a83f1d0150 100644 --- a/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-pure.scen.json +++ b/contracts/feature-tests/multi-contract-features/scenarios/mcf-external-pure.scen.json @@ -6,12 +6,12 @@ "sc:mcf": { "nonce": "0", "balance": "0", - "code": "file:../output/multi-contract-features.wasm" + "code": "mxsc:../output/multi-contract-features.mxsc.json" }, "sc:mcf-view": { "nonce": "0", "balance": "0", - "code": "file:../output/multi-contract-features-view.wasm" + "code": "mxsc:../output/multi-contract-features-view.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/panic-message-features/scenarios/panic-message.scen.json b/contracts/feature-tests/panic-message-features/scenarios/panic-message.scen.json index 321cae054a..7852b73228 100644 --- a/contracts/feature-tests/panic-message-features/scenarios/panic-message.scen.json +++ b/contracts/feature-tests/panic-message-features/scenarios/panic-message.scen.json @@ -8,7 +8,7 @@ "sc:panic_features": { "nonce": "0", "balance": "0", - "code": "file:../output/panic-message-features.wasm" + "code": "mxsc:../output/panic-message-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -45,7 +45,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/panic-message-features.wasm" + "code": "mxsc:../output/panic-message-features.mxsc.json" }, "address:an_account": { "nonce": "1", diff --git a/contracts/feature-tests/payable-features/scenarios/call-value-check.scen.json b/contracts/feature-tests/payable-features/scenarios/call-value-check.scen.json index 3a5f7518dc..23da3773d6 100644 --- a/contracts/feature-tests/payable-features/scenarios/call-value-check.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/call-value-check.scen.json @@ -6,7 +6,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_any_1.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_any_1.scen.json index 0e4a1a3cc3..615636c669 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_any_1.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_any_1.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_any_2.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_any_2.scen.json index b950201519..8715e5b59a 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_any_2.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_any_2.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_any_3.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_any_3.scen.json index 9992d701a3..8891796a1a 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_any_3.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_any_3.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_any_4.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_any_4.scen.json index 4f4135cb72..2379e769ba 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_any_4.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_any_4.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_egld_1.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_egld_1.scen.json index 86a5aa7511..daa18ca3b0 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_egld_1.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_egld_1.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_egld_2.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_egld_2.scen.json index c56e700ff6..6936d54810 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_egld_2.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_egld_2.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_egld_3.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_egld_3.scen.json index d51b99d4a3..bc72384a81 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_egld_3.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_egld_3.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_egld_4.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_egld_4.scen.json index 36e980274d..da92bf5a59 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_egld_4.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_egld_4.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_multi_array.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_multi_array.scen.json index ed0cc1e64f..b05028dfae 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_multi_array.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_multi_array.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_multiple.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_multiple.scen.json index 1aa2f812d1..45d92e9fa7 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_multiple.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_multiple.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_token_1.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_token_1.scen.json index bf1d803680..5142e256f3 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_token_1.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_token_1.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_token_2.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_token_2.scen.json index ba1a78358a..2445d41984 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_token_2.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_token_2.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_token_3.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_token_3.scen.json index c6f52443a0..440a6587c9 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_token_3.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_token_3.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/payable-features/scenarios/payable_token_4.scen.json b/contracts/feature-tests/payable-features/scenarios/payable_token_4.scen.json index d8ef04d237..0397ec9c70 100644 --- a/contracts/feature-tests/payable-features/scenarios/payable_token_4.scen.json +++ b/contracts/feature-tests/payable-features/scenarios/payable_token_4.scen.json @@ -8,7 +8,7 @@ "sc:payable-features": { "nonce": "0", "balance": "0", - "code": "file:../output/payable-features.wasm" + "code": "mxsc:../output/payable-features.mxsc.json" }, "address:an-account": { "nonce": "0", diff --git a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json index b2c78cc8d0..847706b3bf 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json +++ b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json @@ -16,7 +16,7 @@ "0x0000000000000000fb1397e8225ea85e0f0e6e8c7b126d0016ccbde0e667151e": { "nonce": "0", "balance": "0", - "code": "file:../output/rust-testing-framework-tester.wasm", + "code": "mxsc:../output/rust-testing-framework-tester.mxsc.json", "developerRewards": "0" } } @@ -30,7 +30,7 @@ "storage": { "str:totalValue": "0x01" }, - "code": "file:../output/rust-testing-framework-tester.wasm", + "code": "mxsc:../output/rust-testing-framework-tester.mxsc.json", "developerRewards": "0" } } diff --git a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json index b205649402..7deb6bee5b 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json +++ b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json @@ -6,7 +6,7 @@ "0x00000000000000006c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925": { "nonce": "0", "balance": "0", - "code": "file:../output/rust-testing-framework-tester.wasm", + "code": "mxsc:../output/rust-testing-framework-tester.mxsc.json", "developerRewards": "0" } } @@ -29,7 +29,7 @@ ] } }, - "code": "file:../output/rust-testing-framework-tester.wasm", + "code": "mxsc:../output/rust-testing-framework-tester.mxsc.json", "developerRewards": "0" } } diff --git a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_multiple_sc.scen.json b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_multiple_sc.scen.json index b6db8e3870..7e657afd2e 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_multiple_sc.scen.json +++ b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_multiple_sc.scen.json @@ -6,7 +6,7 @@ "0x00000000000000006c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925": { "nonce": "0", "balance": "0", - "code": "file:../output/rust-testing-framework-tester.wasm", + "code": "mxsc:../output/rust-testing-framework-tester.mxsc.json", "developerRewards": "0" } } @@ -17,7 +17,7 @@ "0x0000000000000000fb1397e8225ea85e0f0e6e8c7b126d0016ccbde0e667151e": { "nonce": "0", "balance": "0", - "code": "file:../../../examples/adder/output/adder.wasm", + "code": "mxsc:../../../examples/adder/output/adder.mxsc.json", "developerRewards": "0" } } diff --git a/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json index 0d816749fa..7efa5fc828 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json @@ -45,13 +45,13 @@ "sc:child": { "balance": "500", "owner": "sc:use_module", - "code": "file:../../composability/vault/output/vault.wasm", + "code": "mxsc:../../composability/vault/output/vault.mxsc.json", "developerRewards": "100" }, "sc:not_child": { "balance": "500", "owner": "sc:not_owner", - "code": "file:../../composability/vault/output/vault.wasm" + "code": "mxsc:../../composability/vault/output/vault.mxsc.json" } } }, @@ -102,7 +102,7 @@ "accounts": { "sc:use_module": { "balance": "100", - "code": "file:../output/use-module.wasm", + "code": "mxsc:../output/use-module.mxsc.json", "owner": "address:owner" }, "address:not_owner": { @@ -116,13 +116,13 @@ "sc:child": { "balance": "500", "owner": "sc:use_module", - "code": "file:../../composability/vault/output/vault.wasm", + "code": "mxsc:../../composability/vault/output/vault.mxsc.json", "developerRewards": "0" }, "sc:not_child": { "balance": "500", "owner": "sc:not_owner", - "code": "file:../../composability/vault/output/vault.wasm" + "code": "mxsc:../../composability/vault/output/vault.mxsc.json" } } } diff --git a/contracts/feature-tests/use-module/scenarios/use_module_dns_register.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_dns_register.scen.json index 34c9f18414..024a26147d 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_dns_register.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_dns_register.scen.json @@ -11,7 +11,7 @@ "sc:use_module": { "nonce": "0", "balance": "0", - "code": "file:../output/use-module.wasm", + "code": "mxsc:../output/use-module.mxsc.json", "owner": "address:a_user" }, "sc:dns#87": { @@ -55,7 +55,7 @@ "balance": "*", "username": "str:coolname0001.elrond", "storage": {}, - "code": "file:../output/use-module.wasm" + "code": "mxsc:../output/use-module.mxsc.json" }, "+": "" } diff --git a/contracts/feature-tests/use-module/scenarios/use_module_no_endpoint.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_no_endpoint.scen.json index 2e87aed861..f23f88dad2 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_no_endpoint.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_no_endpoint.scen.json @@ -5,7 +5,7 @@ "accounts": { "address:a_user": {}, "sc:forwarder": { - "code": "file:../output/use-module.wasm" + "code": "mxsc:../output/use-module.mxsc.json" } } }, diff --git a/contracts/feature-tests/use-module/scenarios/use_module_ongoing_operation_example.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_ongoing_operation_example.scen.json index 081b761a5d..45a659c44e 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_ongoing_operation_example.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_ongoing_operation_example.scen.json @@ -5,7 +5,7 @@ "accounts": { "address:a_user": {}, "sc:use_module": { - "code": "file:../output/use-module.wasm" + "code": "mxsc:../output/use-module.mxsc.json" } } }, @@ -39,7 +39,7 @@ "storage": { "str:ongoing_operation:currentOngoingOperation": "" }, - "code": "file:../output/use-module.wasm" + "code": "mxsc:../output/use-module.mxsc.json" }, "+": "" } @@ -74,7 +74,7 @@ "storage": { "str:ongoing_operation:currentOngoingOperation": "1" }, - "code": "file:../output/use-module.wasm" + "code": "mxsc:../output/use-module.mxsc.json" }, "+": "" } @@ -109,7 +109,7 @@ "storage": { "str:ongoing_operation:currentOngoingOperation": "" }, - "code": "file:../output/use-module.wasm" + "code": "mxsc:../output/use-module.mxsc.json" }, "+": "" } From d057d4dabfbfcdab79afd00ca72e82a590296a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Thu, 18 May 2023 17:10:54 +0300 Subject: [PATCH 13/84] Fix path construction --- sdk/scenario-format/src/value_interpreter/file_loader.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/scenario-format/src/value_interpreter/file_loader.rs b/sdk/scenario-format/src/value_interpreter/file_loader.rs index 64d985de6f..53819ebda9 100644 --- a/sdk/scenario-format/src/value_interpreter/file_loader.rs +++ b/sdk/scenario-format/src/value_interpreter/file_loader.rs @@ -25,7 +25,11 @@ pub fn load_file(file_path: &str, context: &InterpreterContext) -> Vec { } pub fn load_mxsc_file_json(mxsc_file_path: &str, context: &InterpreterContext) -> Vec { - match fs::read_to_string(mxsc_file_path) { + let mut path_buf = context.context_path.clone(); + path_buf.push(mxsc_file_path); + path_buf = normalize_path(path_buf); + + match fs::read_to_string(path_buf) { Ok(content) => { let mxsc_json: MxscFileJson = serde_json::from_str(content.as_str()).unwrap(); hex::decode(mxsc_json.code).expect("Could not decode contract code") From c9f2d633eddf98bf02240b7a260ef8a9b30614a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Costin=20Caraba=C8=99?= Date: Fri, 19 May 2023 08:35:49 +0300 Subject: [PATCH 14/84] file_loader: Fixes after review --- .../src/value_interpreter/file_loader.rs | 37 ++++++------------- .../src/value_interpreter/interpreter.rs | 9 +++-- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/sdk/scenario-format/src/value_interpreter/file_loader.rs b/sdk/scenario-format/src/value_interpreter/file_loader.rs index 53819ebda9..658944359a 100644 --- a/sdk/scenario-format/src/value_interpreter/file_loader.rs +++ b/sdk/scenario-format/src/value_interpreter/file_loader.rs @@ -11,38 +11,23 @@ pub struct MxscFileJson { pub code: String, } -pub fn load_file(file_path: &str, context: &InterpreterContext) -> Vec { +pub fn load_file) -> Vec>( + file_path: &str, + context: &InterpreterContext, + process_content: F, +) -> Vec { let mut path_buf = context.context_path.clone(); path_buf.push(file_path); path_buf = normalize_path(path_buf); - fs::read(&path_buf).unwrap_or_else(|_| { - if context.allow_missing_files { - missing_file_value(&path_buf) - } else { - panic!("not found: {path_buf:#?}") - } - }) -} - -pub fn load_mxsc_file_json(mxsc_file_path: &str, context: &InterpreterContext) -> Vec { - let mut path_buf = context.context_path.clone(); - path_buf.push(mxsc_file_path); - path_buf = normalize_path(path_buf); - - match fs::read_to_string(path_buf) { - Ok(content) => { - let mxsc_json: MxscFileJson = serde_json::from_str(content.as_str()).unwrap(); - hex::decode(mxsc_json.code).expect("Could not decode contract code") - }, - Err(_) => { + fs::read(&path_buf) + .map(process_content) + .unwrap_or_else(|_| { if context.allow_missing_files { - let expr_str = format!("MISSING:{mxsc_file_path:?}"); - expr_str.into_bytes() + missing_file_value(&path_buf) } else { - panic!("not found: {mxsc_file_path:#?}") + panic!("not found: {path_buf:#?}") } - }, - } + }) } fn missing_file_value(path_buf: &Path) -> Vec { diff --git a/sdk/scenario-format/src/value_interpreter/interpreter.rs b/sdk/scenario-format/src/value_interpreter/interpreter.rs index 82b14a9c36..66f9be297b 100644 --- a/sdk/scenario-format/src/value_interpreter/interpreter.rs +++ b/sdk/scenario-format/src/value_interpreter/interpreter.rs @@ -1,7 +1,7 @@ use crate::{interpret_trait::InterpreterContext, serde_raw::ValueSubTree}; use super::{ - file_loader::{load_file, load_mxsc_file_json}, + file_loader::{load_file, MxscFileJson}, functions::*, parse_num::*, prefixes::*, @@ -65,11 +65,14 @@ pub fn interpret_string(s: &str, context: &InterpreterContext) -> Vec { } if let Some(stripped) = s.strip_prefix(FILE_PREFIX) { - return load_file(stripped, context); + return load_file(stripped, context, |c| c); } if let Some(stripped) = s.strip_prefix(MXSC_PREFIX) { - return load_mxsc_file_json(stripped, context); + return load_file(stripped, context, |content| { + let mxsc_json: MxscFileJson = serde_json::from_slice(&content).unwrap(); + hex::decode(mxsc_json.code).expect("Could not decode contract code") + }); } if let Some(stripped) = s.strip_prefix(KECCAK256_PREFIX) { From 6d126340fdc85e7087c1f66eb1f9e70e56a6bfd6 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 1 Sep 2023 18:33:16 +0300 Subject: [PATCH 15/84] contracts: "file:*.wasm" -> "mxsc:*.mxsc.json" --- .../scenarios/large_storage.scen.json | 2 +- .../tests/large_storage_scenario_rs_test.rs | 2 +- .../tests/linked_list_repeat_blackbox_test.rs | 2 +- .../linked-list-repeat/tests/scenario_rs_test.rs | 2 +- .../mappers/map-repeat/tests/scenario_rs_test.rs | 2 +- .../queue-repeat/tests/scenario_rs_test.rs | 2 +- .../mappers/set-repeat/tests/scenario_rs_test.rs | 2 +- .../tests/scenario_rs_test.rs | 2 +- .../mappers/vec-repeat/tests/scenario_rs_test.rs | 2 +- .../send-tx-repeat/tests/scenario_rs_test.rs | 2 +- .../str-repeat/tests/scenario_rs_test.rs | 2 +- .../tests/wegld_swap_scenario_rs_test.rs | 2 +- .../adder/interact/src/adder_interact.rs | 2 +- .../adder/scenarios/interactor_trace.scen.json | 2 +- .../examples/adder/tests/adder_blackbox_test.rs | 2 +- .../adder/tests/adder_blackbox_upgrade_test.rs | 4 ++-- .../adder/tests/adder_scenario_rs_test.rs | 2 +- .../examples/adder/tests/adder_whitebox_test.rs | 4 ++-- .../tests/bonding_curve_scenario_rs_test.rs | 2 +- .../scenarios/_generated_fund.scen.json | 2 +- .../scenarios/_generated_init.scen.json | 2 +- .../scenarios/_generated_query_status.scen.json | 2 +- .../scenarios/_generated_sc_err.scen.json | 2 +- .../tests/crowdfunding_esdt_blackbox_test.rs | 2 +- .../tests/crowdfunding_esdt_scenario_rs_test.rs | 5 +++++ .../tests/crypto_bubbles_scenario_rs_test.rs | 2 +- .../tests/kitty_auction_scenario_rs_test.rs | 4 ++-- .../tests/kitty_genetic_alg_scenario_rs_test.rs | 2 +- .../tests/kitty_ownership_scenario_rs_test.rs | 4 ++-- .../digital-cash/scenarios/claim-egld.scen.json | 2 +- .../digital-cash/scenarios/claim-esdt.scen.json | 2 +- .../digital-cash/scenarios/claim-fees.scen.json | 2 +- .../scenarios/claim-multi-esdt.scen.json | 2 +- .../scenarios/fund-egld-and-esdt.scen.json | 2 +- .../scenarios/set-accounts.scen.json | 2 +- .../scenarios/withdraw-multi-esdt.scen.json | 4 ++-- .../tests/digital_cash_scenario_rs_test.rs | 2 +- .../empty/tests/empty_scenario_rs_test.rs | 2 +- .../esdt_transfer_with_fee_scenario_rs_test.rs | 2 +- .../tests/factorial_scenario_rs_test.rs | 2 +- .../tests/lottery_esdt_scenario_rs_test.rs | 2 +- .../multisig/interact/src/multisig_interact.rs | 2 +- .../scenarios/deployAdder_then_call.scen.json | 4 ++-- .../multisig/scenarios/deployFactorial.scen.json | 2 +- .../multisig/scenarios/interactor_nft.scen.json | 2 +- .../scenarios/interactor_nft_all_roles.scen.json | 2 +- .../scenarios/interactor_wegld.scen.json | 2 +- .../scenarios/steps/init_accounts.steps.json | 4 ++-- .../multisig/scenarios/upgrade.scen.json | 2 +- .../multisig/tests/multisig_blackbox_test.rs | 6 +++--- .../multisig/tests/multisig_scenario_rs_test.rs | 8 ++++---- .../multisig/tests/multisig_whitebox_test.rs | 10 +++++----- .../pair/tests/pair_scenario_rs_test.rs | 2 +- .../tests/ping_pong_egld_scenario_rs_test.rs | 2 +- .../proxy-pause/scenarios/init.scen.json | 2 +- .../tests/proxy_pause_scenario_rs_test.rs | 4 ++-- .../tests/token_release_scenario_rs_test.rs | 2 +- .../tests/alloc_features_scenario_rs_test.rs | 2 +- .../basic-features/interact/src/bf_interact.rs | 2 +- .../tests/basic_features_scenario_rs_test.rs | 4 ++-- .../tests/big_float_scenario_rs_test.rs | 2 +- .../esdt-contract-pair/tests/scenario_rs_test.rs | 4 ++-- .../interact/src/comp_interact_controller.rs | 4 ++-- .../scenarios/forw_raw_contract_deploy.scen.json | 4 ++-- .../forw_raw_contract_upgrade.scen.json | 2 +- .../forwarder_contract_deploy.scen.json | 6 +++--- .../forwarder_contract_upgrade.scen.json | 2 +- .../scenarios/proxy_test_init.scen.json | 2 +- .../scenarios/proxy_test_upgrade.scen.json | 2 +- .../tests/composability_scenario_rs_test.rs | 16 ++++++++-------- .../tests/crowdfunding_erc20_scenario_rs_test.rs | 4 ++-- .../erc1155_marketplace_scenario_rs_test.rs | 4 ++-- .../erc1155/tests/erc1155_scenario_rs_test.rs | 4 ++-- .../erc20/tests/erc20_scenario_rs_test.rs | 2 +- .../erc721/tests/nft_scenario_rs_test.rs | 2 +- .../tests/lottery_erc20_scenario_rs_test.rs | 4 ++-- .../tests/msg_scenario_rs_test.rs | 2 +- .../tests/managed_map_scenario_rs_test.rs | 2 +- .../tests/multi_contract_scenario_rs_test.rs | 6 +++--- .../scenarios/panic-after-log.scen.json | 4 ++-- .../tests/pmf_scenario_rs_test.rs | 2 +- .../tests/payable_blackbox_test.rs | 2 +- .../tests/payable_scenario_rs_test.rs | 2 +- .../interact-rs/src/interactor_main.rs | 2 +- .../scenarios/test.scen.json | 5 ++--- .../scenarios/test_esdt_generation.scen.json | 5 ++--- .../scenarios/test_multiple_sc.scen.json | 6 ++---- ..._testing_framework_tester_scenario_rs_test.rs | 4 ++++ .../tests/tester_blackbox_test.rs | 2 +- .../scenarios/use_module_dns_register.scen.json | 2 +- .../tests/use_module_scenario_rs_test.rs | 4 ++-- .../scenario/tests/contract_without_macros.rs | 2 +- .../scenarios-io/example_normalized.scen.json | 4 ++-- .../tests/scenarios-io/example_raw.scen.json | 4 ++-- .../src/value_interpreter/prefixes.rs | 2 +- 95 files changed, 145 insertions(+), 140 deletions(-) diff --git a/contracts/benchmarks/large-storage/scenarios/large_storage.scen.json b/contracts/benchmarks/large-storage/scenarios/large_storage.scen.json index 99f9d8fb17..fab53d3199 100644 --- a/contracts/benchmarks/large-storage/scenarios/large_storage.scen.json +++ b/contracts/benchmarks/large-storage/scenarios/large_storage.scen.json @@ -22,7 +22,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/large-storage.wasm", + "contractCode": "mxsc:../output/large-storage.mxsc.json", "arguments": [], "gasLimit": "2,000,000", "gasPrice": "0" diff --git a/contracts/benchmarks/large-storage/tests/large_storage_scenario_rs_test.rs b/contracts/benchmarks/large-storage/tests/large_storage_scenario_rs_test.rs index ffd59d2f00..38297fd2f2 100644 --- a/contracts/benchmarks/large-storage/tests/large_storage_scenario_rs_test.rs +++ b/contracts/benchmarks/large-storage/tests/large_storage_scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/benchmarks/large-storage"); blockchain.register_contract( - "file:output/large-storage.wasm", + "mxsc:output/large-storage.mxsc.json", large_storage::ContractBuilder, ); blockchain diff --git a/contracts/benchmarks/mappers/linked-list-repeat/tests/linked_list_repeat_blackbox_test.rs b/contracts/benchmarks/mappers/linked-list-repeat/tests/linked_list_repeat_blackbox_test.rs index 2d109c8f64..47af800bb8 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/tests/linked_list_repeat_blackbox_test.rs +++ b/contracts/benchmarks/mappers/linked-list-repeat/tests/linked_list_repeat_blackbox_test.rs @@ -3,7 +3,7 @@ use linked_list_repeat::ProxyTrait; use multiversx_sc::types::{MultiValueEncoded, TokenIdentifier}; use multiversx_sc_scenario::{api::StaticApi, scenario_model::*, *}; -const WASM_PATH_EXPR: &str = "file:output/linked-list-repeat.wasm"; +const WASM_PATH_EXPR: &str = "mxsc:output/linked-list-repeat.mxsc.json"; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); diff --git a/contracts/benchmarks/mappers/linked-list-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/mappers/linked-list-repeat/tests/scenario_rs_test.rs index d80a517089..c7b91be79e 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/mappers/linked-list-repeat/tests/scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/linked-list-repeat"); blockchain.register_contract( - "file:output/linked-list-repeat.wasm", + "mxsc:output/linked-list-repeat.mxsc.json", linked_list_repeat::ContractBuilder, ); blockchain diff --git a/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs index e53c9a9601..d1d78e6cb1 100644 --- a/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/map-repeat"); - blockchain.register_contract("file:output/map-repeat.wasm", map_repeat::ContractBuilder); + blockchain.register_contract("mxsc:output/map-repeat.mxsc.json", map_repeat::ContractBuilder); blockchain } diff --git a/contracts/benchmarks/mappers/queue-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/mappers/queue-repeat/tests/scenario_rs_test.rs index 39140f455f..4e7ac9ba66 100644 --- a/contracts/benchmarks/mappers/queue-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/mappers/queue-repeat/tests/scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/queue-repeat"); blockchain.register_contract( - "file:output/queue-repeat.wasm", + "mxsc:output/queue-repeat.mxsc.json", queue_repeat::ContractBuilder, ); blockchain diff --git a/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs index 3f94fcc907..77f5338006 100644 --- a/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/set-repeat"); - blockchain.register_contract("file:output/set-repeat.wasm", set_repeat::ContractBuilder); + blockchain.register_contract("mxsc:output/set-repeat.mxsc.json", set_repeat::ContractBuilder); blockchain } diff --git a/contracts/benchmarks/mappers/single-value-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/mappers/single-value-repeat/tests/scenario_rs_test.rs index 4017aa5ad1..cf43c6d95f 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/mappers/single-value-repeat/tests/scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/single-value-repeat"); blockchain.register_contract( - "file:output/single-value-repeat.wasm", + "mxsc:output/single-value-repeat.mxsc.json", single_value_repeat::ContractBuilder, ); blockchain diff --git a/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs index 9d638d905f..220f3e55fa 100644 --- a/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/vec-repeat"); - blockchain.register_contract("file:output/vec-repeat.wasm", vec_repeat::ContractBuilder); + blockchain.register_contract("mxsc:output/vec-repeat.mxsc.json", vec_repeat::ContractBuilder); blockchain } diff --git a/contracts/benchmarks/send-tx-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/send-tx-repeat/tests/scenario_rs_test.rs index c5261ddf82..cccbea31c1 100644 --- a/contracts/benchmarks/send-tx-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/send-tx-repeat/tests/scenario_rs_test.rs @@ -3,7 +3,7 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.register_contract( - "file:output/send-tx-repeat.wasm", + "mxsc:output/send-tx-repeat.mxsc.json", send_tx_repeat::ContractBuilder, ); blockchain diff --git a/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs index d8d8856bb6..741a494df1 100644 --- a/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs @@ -2,7 +2,7 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); - blockchain.register_contract("file:output/str-repeat.wasm", str_repeat::ContractBuilder); + blockchain.register_contract("mxsc:output/str-repeat.mxsc.json", str_repeat::ContractBuilder); blockchain } diff --git a/contracts/core/wegld-swap/tests/wegld_swap_scenario_rs_test.rs b/contracts/core/wegld-swap/tests/wegld_swap_scenario_rs_test.rs index 29b8456daf..01770e4b2e 100644 --- a/contracts/core/wegld-swap/tests/wegld_swap_scenario_rs_test.rs +++ b/contracts/core/wegld-swap/tests/wegld_swap_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/core/wegld-swap"); blockchain.register_contract( - "file:output/multiversx-wegld-swap-sc.wasm", + "mxsc:output/multiversx-wegld-swap-sc.mxsc.json", multiversx_wegld_swap_sc::ContractBuilder, ); blockchain diff --git a/contracts/examples/adder/interact/src/adder_interact.rs b/contracts/examples/adder/interact/src/adder_interact.rs index 3102752c22..a0ed636947 100644 --- a/contracts/examples/adder/interact/src/adder_interact.rs +++ b/contracts/examples/adder/interact/src/adder_interact.rs @@ -70,7 +70,7 @@ impl AdderInteract { .await; let wallet_address = interactor.register_wallet(test_wallets::mike()); let adder_code = - BytesValue::interpret_from("file:../output/adder.wasm", &InterpreterContext::default()); + BytesValue::interpret_from("mxsc:../output/adder.mxsc.json", &InterpreterContext::default()); Self { interactor, diff --git a/contracts/examples/adder/scenarios/interactor_trace.scen.json b/contracts/examples/adder/scenarios/interactor_trace.scen.json index bb20201bac..fb077ddb6a 100644 --- a/contracts/examples/adder/scenarios/interactor_trace.scen.json +++ b/contracts/examples/adder/scenarios/interactor_trace.scen.json @@ -31,7 +31,7 @@ "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", - "contractCode": "file:../output/adder.wasm", + "contractCode": "mxsc:../output/adder.mxsc.json", "arguments": [ "0x00" ], diff --git a/contracts/examples/adder/tests/adder_blackbox_test.rs b/contracts/examples/adder/tests/adder_blackbox_test.rs index 3d2e166582..92dba83b12 100644 --- a/contracts/examples/adder/tests/adder_blackbox_test.rs +++ b/contracts/examples/adder/tests/adder_blackbox_test.rs @@ -1,6 +1,6 @@ use multiversx_sc_scenario::{scenario_model::*, *}; -const ADDER_PATH_EXPR: &str = "file:output/adder.wasm"; +const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json"; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); diff --git a/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs b/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs index 1e3301f335..4cb12cad54 100644 --- a/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs +++ b/contracts/examples/adder/tests/adder_blackbox_upgrade_test.rs @@ -1,12 +1,12 @@ use multiversx_sc_scenario::{scenario_model::*, *}; -const ADDER_PATH_EXPR: &str = "file:output/adder.wasm"; +const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json"; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/adder"); - blockchain.register_contract("file:output/adder.wasm", adder::ContractBuilder); + blockchain.register_contract("mxsc:output/adder.mxsc.json", adder::ContractBuilder); blockchain } diff --git a/contracts/examples/adder/tests/adder_scenario_rs_test.rs b/contracts/examples/adder/tests/adder_scenario_rs_test.rs index a92de289ff..c467100633 100644 --- a/contracts/examples/adder/tests/adder_scenario_rs_test.rs +++ b/contracts/examples/adder/tests/adder_scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/adder"); - blockchain.register_contract("file:output/adder.wasm", adder::ContractBuilder); + blockchain.register_contract("mxsc:output/adder.mxsc.json", adder::ContractBuilder); blockchain } diff --git a/contracts/examples/adder/tests/adder_whitebox_test.rs b/contracts/examples/adder/tests/adder_whitebox_test.rs index 97916d4ec4..d068aa1b1d 100644 --- a/contracts/examples/adder/tests/adder_whitebox_test.rs +++ b/contracts/examples/adder/tests/adder_whitebox_test.rs @@ -1,13 +1,13 @@ use adder::*; use multiversx_sc_scenario::{scenario_model::*, *}; -const ADDER_PATH_EXPR: &str = "file:output/adder.wasm"; +const ADDER_PATH_EXPR: &str = "mxsc:output/adder.mxsc.json"; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/adder"); - blockchain.register_contract("file:output/adder.wasm", adder::ContractBuilder); + blockchain.register_contract("mxsc:output/adder.mxsc.json", adder::ContractBuilder); blockchain } diff --git a/contracts/examples/bonding-curve-contract/tests/bonding_curve_scenario_rs_test.rs b/contracts/examples/bonding-curve-contract/tests/bonding_curve_scenario_rs_test.rs index 576ed07983..81a143734b 100644 --- a/contracts/examples/bonding-curve-contract/tests/bonding_curve_scenario_rs_test.rs +++ b/contracts/examples/bonding-curve-contract/tests/bonding_curve_scenario_rs_test.rs @@ -3,7 +3,7 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.register_contract( - "file:output/bonding-curve-contract.wasm", + "mxsc:output/bonding-curve-contract.mxsc.json", bonding_curve_contract::ContractBuilder, ); blockchain diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json index 479056c3eb..3959ce0723 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json @@ -89,7 +89,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", + "code": "file:../output/crowdfunding-esdt.wasm", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json index 1bd866ea49..08b369285e 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json @@ -89,7 +89,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", + "code": "file:../output/crowdfunding-esdt.wasm", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json index 5008dd7ec2..c78a0a799f 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json @@ -89,7 +89,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", + "code": "file:../output/crowdfunding-esdt.wasm", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json index ada82b8b08..b820dc1521 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json @@ -89,7 +89,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", + "code": "file:../output/crowdfunding-esdt.wasm", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs index 66311ab731..bcee919854 100644 --- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs +++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs @@ -2,7 +2,7 @@ use crowdfunding_esdt::*; use multiversx_sc::types::EgldOrEsdtTokenIdentifier; use multiversx_sc_scenario::{api::StaticApi, scenario_model::*, *}; -const CF_PATH_EXPR: &str = "file:output/crowdfunding-esdt.wasm"; +const CF_PATH_EXPR: &str = "mxsc:output/crowdfunding-esdt.mxsc.json"; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); diff --git a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_scenario_rs_test.rs b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_scenario_rs_test.rs index 2d1ff391e4..22a542bf62 100644 --- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_scenario_rs_test.rs +++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_scenario_rs_test.rs @@ -4,10 +4,15 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/crowdfunding-esdt"); + blockchain.register_contract( + "mxsc:output/crowdfunding-esdt.mxsc.json", + crowdfunding_esdt::ContractBuilder, + ); blockchain.register_contract( "file:output/crowdfunding-esdt.wasm", crowdfunding_esdt::ContractBuilder, ); + blockchain } diff --git a/contracts/examples/crypto-bubbles/tests/crypto_bubbles_scenario_rs_test.rs b/contracts/examples/crypto-bubbles/tests/crypto_bubbles_scenario_rs_test.rs index 3f54c45a4f..7beee20ecb 100644 --- a/contracts/examples/crypto-bubbles/tests/crypto_bubbles_scenario_rs_test.rs +++ b/contracts/examples/crypto-bubbles/tests/crypto_bubbles_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/examples/crypto-bubbles"); blockchain.register_contract( - "file:output/crypto-bubbles.wasm", + "mxsc:output/crypto-bubbles.mxsc.json", crypto_bubbles::ContractBuilder, ); blockchain diff --git a/contracts/examples/crypto-kitties/kitty-auction/tests/kitty_auction_scenario_rs_test.rs b/contracts/examples/crypto-kitties/kitty-auction/tests/kitty_auction_scenario_rs_test.rs index 110acd8da4..e7fce12ce1 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/tests/kitty_auction_scenario_rs_test.rs +++ b/contracts/examples/crypto-kitties/kitty-auction/tests/kitty_auction_scenario_rs_test.rs @@ -4,11 +4,11 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.register_contract( - "file:../kitty-ownership/output/kitty-ownership.wasm", + "mxsc:../kitty-ownership/output/kitty-ownership.mxsc.json", kitty_ownership::ContractBuilder, ); blockchain.register_contract( - "file:output/kitty-auction.wasm", + "mxsc:output/kitty-auction.mxsc.json", kitty_auction::ContractBuilder, ); diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/tests/kitty_genetic_alg_scenario_rs_test.rs b/contracts/examples/crypto-kitties/kitty-genetic-alg/tests/kitty_genetic_alg_scenario_rs_test.rs index 8389bb81bd..08672d2f0c 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/tests/kitty_genetic_alg_scenario_rs_test.rs +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/tests/kitty_genetic_alg_scenario_rs_test.rs @@ -3,7 +3,7 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.register_contract( - "file:output/kitty-genetic-alg.wasm", + "mxsc:output/kitty-genetic-alg.mxsc.json", kitty_genetic_alg::ContractBuilder, ); blockchain diff --git a/contracts/examples/crypto-kitties/kitty-ownership/tests/kitty_ownership_scenario_rs_test.rs b/contracts/examples/crypto-kitties/kitty-ownership/tests/kitty_ownership_scenario_rs_test.rs index 9101ffbf0d..238a3f8fce 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/tests/kitty_ownership_scenario_rs_test.rs +++ b/contracts/examples/crypto-kitties/kitty-ownership/tests/kitty_ownership_scenario_rs_test.rs @@ -4,11 +4,11 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.register_contract( - "file:../kitty-genetic-alg/output/kitty-genetic-alg.wasm", + "mxsc:../kitty-genetic-alg/output/kitty-genetic-alg.mxsc.json", kitty_genetic_alg::ContractBuilder, ); blockchain.register_contract( - "file:output/kitty-ownership.wasm", + "mxsc:output/kitty-ownership.mxsc.json", kitty_ownership::ContractBuilder, ); diff --git a/contracts/examples/digital-cash/scenarios/claim-egld.scen.json b/contracts/examples/digital-cash/scenarios/claim-egld.scen.json index 8945970816..a59526a183 100644 --- a/contracts/examples/digital-cash/scenarios/claim-egld.scen.json +++ b/contracts/examples/digital-cash/scenarios/claim-egld.scen.json @@ -155,7 +155,7 @@ "str:fee": "10", "str:collected_fees": "10" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "3", diff --git a/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json b/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json index 7ced2430e0..fa69275a31 100644 --- a/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/claim-esdt.scen.json @@ -154,7 +154,7 @@ "str:fee": "10", "str:collected_fees": "10" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "7", diff --git a/contracts/examples/digital-cash/scenarios/claim-fees.scen.json b/contracts/examples/digital-cash/scenarios/claim-fees.scen.json index 6256577609..95175b3695 100644 --- a/contracts/examples/digital-cash/scenarios/claim-fees.scen.json +++ b/contracts/examples/digital-cash/scenarios/claim-fees.scen.json @@ -89,7 +89,7 @@ }, "str:fee": "10" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "3", diff --git a/contracts/examples/digital-cash/scenarios/claim-multi-esdt.scen.json b/contracts/examples/digital-cash/scenarios/claim-multi-esdt.scen.json index d2701252eb..5d34e6bfd6 100644 --- a/contracts/examples/digital-cash/scenarios/claim-multi-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/claim-multi-esdt.scen.json @@ -152,7 +152,7 @@ "str:fee": "10", "str:collected_fees": "30" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "3", diff --git a/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json b/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json index 9e5cde8508..0c23075fb1 100644 --- a/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/fund-egld-and-esdt.scen.json @@ -388,7 +388,7 @@ }, "str:fee": "10" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "3", diff --git a/contracts/examples/digital-cash/scenarios/set-accounts.scen.json b/contracts/examples/digital-cash/scenarios/set-accounts.scen.json index 46f8e76e79..a4d39878f2 100644 --- a/contracts/examples/digital-cash/scenarios/set-accounts.scen.json +++ b/contracts/examples/digital-cash/scenarios/set-accounts.scen.json @@ -65,7 +65,7 @@ "storage": { "str:fee": "10" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "0", diff --git a/contracts/examples/digital-cash/scenarios/withdraw-multi-esdt.scen.json b/contracts/examples/digital-cash/scenarios/withdraw-multi-esdt.scen.json index f9194207bd..a05b965d8d 100644 --- a/contracts/examples/digital-cash/scenarios/withdraw-multi-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/withdraw-multi-esdt.scen.json @@ -75,7 +75,7 @@ }, "str:fee": "10" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "3", @@ -195,7 +195,7 @@ }, "str:fee": "10" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "3", diff --git a/contracts/examples/digital-cash/tests/digital_cash_scenario_rs_test.rs b/contracts/examples/digital-cash/tests/digital_cash_scenario_rs_test.rs index bc20caac7d..03ad1f5015 100644 --- a/contracts/examples/digital-cash/tests/digital_cash_scenario_rs_test.rs +++ b/contracts/examples/digital-cash/tests/digital_cash_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/examples/digital-cash"); blockchain.register_contract( - "file:output/digital-cash.wasm", + "mxsc:output/digital-cash.mxsc.json", digital_cash::ContractBuilder, ); blockchain diff --git a/contracts/examples/empty/tests/empty_scenario_rs_test.rs b/contracts/examples/empty/tests/empty_scenario_rs_test.rs index a4e9d0166c..d4f9a9b3ab 100644 --- a/contracts/examples/empty/tests/empty_scenario_rs_test.rs +++ b/contracts/examples/empty/tests/empty_scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/empty"); - blockchain.register_contract("file:output/empty.wasm", empty::ContractBuilder); + blockchain.register_contract("mxsc:output/empty.mxsc.json", empty::ContractBuilder); blockchain } diff --git a/contracts/examples/esdt-transfer-with-fee/tests/esdt_transfer_with_fee_scenario_rs_test.rs b/contracts/examples/esdt-transfer-with-fee/tests/esdt_transfer_with_fee_scenario_rs_test.rs index 4dd601212a..2dd7248b2a 100644 --- a/contracts/examples/esdt-transfer-with-fee/tests/esdt_transfer_with_fee_scenario_rs_test.rs +++ b/contracts/examples/esdt-transfer-with-fee/tests/esdt_transfer_with_fee_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/examples/esdt-transfer-with-fee"); blockchain.register_contract( - "file:output/esdt-transfer-with-fee.wasm", + "mxsc:output/esdt-transfer-with-fee.mxsc.json", esdt_transfer_with_fee::ContractBuilder, ); blockchain diff --git a/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs b/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs index 9e192fbb3a..7fe36b98bf 100644 --- a/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs +++ b/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/factorial"); - blockchain.register_contract("file:output/factorial.wasm", factorial::ContractBuilder); + blockchain.register_contract("mxsc:output/factorial.mxsc.json", factorial::ContractBuilder); blockchain } diff --git a/contracts/examples/lottery-esdt/tests/lottery_esdt_scenario_rs_test.rs b/contracts/examples/lottery-esdt/tests/lottery_esdt_scenario_rs_test.rs index 31ebeb7a7f..5fc5e76eba 100644 --- a/contracts/examples/lottery-esdt/tests/lottery_esdt_scenario_rs_test.rs +++ b/contracts/examples/lottery-esdt/tests/lottery_esdt_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/examples/lottery-esdt"); blockchain.register_contract( - "file:output/lottery-esdt.wasm", + "mxsc:output/lottery-esdt.mxsc.json", lottery_esdt::ContractBuilder, ); blockchain diff --git a/contracts/examples/multisig/interact/src/multisig_interact.rs b/contracts/examples/multisig/interact/src/multisig_interact.rs index 454391679b..cf679c5a13 100644 --- a/contracts/examples/multisig/interact/src/multisig_interact.rs +++ b/contracts/examples/multisig/interact/src/multisig_interact.rs @@ -110,7 +110,7 @@ impl MultisigInteract { .await; let wallet_address = interactor.register_wallet(test_wallets::mike()); let multisig_code = BytesValue::interpret_from( - "file:../output/multisig.wasm", + "mxsc:../output/multisig.mxsc.json", &InterpreterContext::default(), ); diff --git a/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json b/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json index 38b0411cdc..ff693821f8 100644 --- a/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json +++ b/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json @@ -169,7 +169,7 @@ "storage": { "str:sum": "1234" }, - "code": "file:../test-contracts/adder.wasm" + "code": "mxsc:../test-contracts/adder.mxsc.json" }, "+": "" } @@ -307,7 +307,7 @@ "storage": { "str:sum": "2468" }, - "code": "file:../test-contracts/adder.wasm" + "code": "mxsc:../test-contracts/adder.mxsc.json" }, "+": "" } diff --git a/contracts/examples/multisig/scenarios/deployFactorial.scen.json b/contracts/examples/multisig/scenarios/deployFactorial.scen.json index c2fea37893..0df7b2a111 100644 --- a/contracts/examples/multisig/scenarios/deployFactorial.scen.json +++ b/contracts/examples/multisig/scenarios/deployFactorial.scen.json @@ -190,7 +190,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../test-contracts/factorial.wasm" + "code": "mxsc:../test-contracts/factorial.mxsc.json" }, "+": "" } diff --git a/contracts/examples/multisig/scenarios/interactor_nft.scen.json b/contracts/examples/multisig/scenarios/interactor_nft.scen.json index f920c34a36..c2d0796fa5 100644 --- a/contracts/examples/multisig/scenarios/interactor_nft.scen.json +++ b/contracts/examples/multisig/scenarios/interactor_nft.scen.json @@ -139,7 +139,7 @@ "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", - "contractCode": "file:../output/multisig.wasm", + "contractCode": "mxsc:../output/multisig.mxsc.json", "arguments": [ "0x02", "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", diff --git a/contracts/examples/multisig/scenarios/interactor_nft_all_roles.scen.json b/contracts/examples/multisig/scenarios/interactor_nft_all_roles.scen.json index 8746f7fba9..d74848e97e 100644 --- a/contracts/examples/multisig/scenarios/interactor_nft_all_roles.scen.json +++ b/contracts/examples/multisig/scenarios/interactor_nft_all_roles.scen.json @@ -175,7 +175,7 @@ "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", - "contractCode": "file:../output/multisig.wasm", + "contractCode": "mxsc:../output/multisig.mxsc.json", "arguments": [ "0x02", "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", diff --git a/contracts/examples/multisig/scenarios/interactor_wegld.scen.json b/contracts/examples/multisig/scenarios/interactor_wegld.scen.json index ea9ed6ff68..a30e7e6112 100644 --- a/contracts/examples/multisig/scenarios/interactor_wegld.scen.json +++ b/contracts/examples/multisig/scenarios/interactor_wegld.scen.json @@ -99,7 +99,7 @@ "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", - "contractCode": "file:../output/multisig.wasm", + "contractCode": "mxsc:../output/multisig.mxsc.json", "arguments": [ "0x02", "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", diff --git a/contracts/examples/multisig/scenarios/steps/init_accounts.steps.json b/contracts/examples/multisig/scenarios/steps/init_accounts.steps.json index 2e16b4d454..d40648222c 100644 --- a/contracts/examples/multisig/scenarios/steps/init_accounts.steps.json +++ b/contracts/examples/multisig/scenarios/steps/init_accounts.steps.json @@ -30,10 +30,10 @@ "balance": "0" }, "sc:adder-code": { - "code": "file:../../test-contracts/adder.wasm" + "code": "mxsc:../../test-contracts/adder.mxsc.json" }, "sc:factorial-code": { - "code": "file:../../test-contracts/factorial.wasm" + "code": "mxsc:../../test-contracts/factorial.mxsc.json" } }, "newAddresses": [ diff --git a/contracts/examples/multisig/scenarios/upgrade.scen.json b/contracts/examples/multisig/scenarios/upgrade.scen.json index 89efaae490..016a0bd836 100644 --- a/contracts/examples/multisig/scenarios/upgrade.scen.json +++ b/contracts/examples/multisig/scenarios/upgrade.scen.json @@ -110,7 +110,7 @@ "str:quorum": "1", "str:sum": "1234" }, - "code": "file:../test-contracts/adder.wasm" + "code": "mxsc:../test-contracts/adder.mxsc.json" }, "+": "" } diff --git a/contracts/examples/multisig/tests/multisig_blackbox_test.rs b/contracts/examples/multisig/tests/multisig_blackbox_test.rs index 1ff87d1d37..0a96eb0276 100644 --- a/contracts/examples/multisig/tests/multisig_blackbox_test.rs +++ b/contracts/examples/multisig/tests/multisig_blackbox_test.rs @@ -23,10 +23,10 @@ use num_bigint::BigUint; const ADDER_ADDRESS_EXPR: &str = "sc:adder"; const ADDER_OWNER_ADDRESS_EXPR: &str = "address:adder-owner"; -const ADDER_PATH_EXPR: &str = "file:test-contracts/adder.wasm"; +const ADDER_PATH_EXPR: &str = "mxsc:test-contracts/adder.mxsc.json"; const BOARD_MEMBER_ADDRESS_EXPR: &str = "address:board-member"; const MULTISIG_ADDRESS_EXPR: &str = "sc:multisig"; -const MULTISIG_PATH_EXPR: &str = "file:output/multisig.wasm"; +const MULTISIG_PATH_EXPR: &str = "mxsc:output/multisig.mxsc.json"; const OWNER_ADDRESS_EXPR: &str = "address:owner"; const PROPOSER_ADDRESS_EXPR: &str = "address:proposer"; const PROPOSER_BALANCE_EXPR: &str = "100,000,000"; @@ -560,7 +560,7 @@ fn test_deploy_and_upgrade_from_source() { ); const FACTORIAL_ADDRESS_EXPR: &str = "sc:factorial"; - const FACTORIAL_PATH_EXPR: &str = "file:test-contracts/factorial.wasm"; + const FACTORIAL_PATH_EXPR: &str = "mxsc:test-contracts/factorial.mxsc.json"; let factorial_code = state.world.code_expression(FACTORIAL_PATH_EXPR); let factorial_address = AddressValue::from(FACTORIAL_ADDRESS_EXPR).to_address(); diff --git a/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs b/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs index 27d286e1d9..4687c335e1 100644 --- a/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs +++ b/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs @@ -7,20 +7,20 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/examples/multisig"); blockchain.register_partial_contract::( - "file:output/multisig.wasm", + "mxsc:output/multisig.mxsc.json", multisig::ContractBuilder, "multisig", ); blockchain.register_partial_contract::( - "file:output/multisig-view.wasm", + "mxsc:output/multisig-view.mxsc.json", multisig::ContractBuilder, "multisig-view", ); - blockchain.register_contract("file:test-contracts/adder.wasm", adder::ContractBuilder); + blockchain.register_contract("mxsc:test-contracts/adder.mxsc.json", adder::ContractBuilder); blockchain.register_contract( - "file:test-contracts/factorial.wasm", + "mxsc:test-contracts/factorial.mxsc.json", factorial::ContractBuilder, ); diff --git a/contracts/examples/multisig/tests/multisig_whitebox_test.rs b/contracts/examples/multisig/tests/multisig_whitebox_test.rs index 6c949fa842..35dc7429e3 100644 --- a/contracts/examples/multisig/tests/multisig_whitebox_test.rs +++ b/contracts/examples/multisig/tests/multisig_whitebox_test.rs @@ -32,7 +32,7 @@ const OWNER_ADDRESS_EXPR: &str = "address:owner"; const PROPOSER_ADDRESS_EXPR: &str = "address:proposer"; const BOARD_MEMBER_ADDRESS_EXPR: &str = "address:board-member"; const MULTISIG_ADDRESS_EXPR: &str = "sc:multisig"; -const MULTISIG_PATH_EXPR: &str = "file:output/multisig.wasm"; +const MULTISIG_PATH_EXPR: &str = "mxsc:output/multisig.mxsc.json"; const QUORUM_SIZE: usize = 1; type RustBigUint = num_bigint::BigUint; @@ -609,7 +609,7 @@ fn test_transfer_execute_sc_all() { const ADDER_OWNER_ADDRESS_EXPR: &str = "address:adder-owner"; const ADDER_ADDRESS_EXPR: &str = "sc:adder"; - const ADDER_PATH_EXPR: &str = "file:test-contracts/adder.wasm"; + const ADDER_PATH_EXPR: &str = "mxsc:test-contracts/adder.mxsc.json"; world.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder); world.set_state_step( @@ -670,7 +670,7 @@ fn test_async_call_to_sc() { const ADDER_OWNER_ADDRESS_EXPR: &str = "address:adder-owner"; const ADDER_ADDRESS_EXPR: &str = "sc:adder"; - const ADDER_PATH_EXPR: &str = "file:test-contracts/adder.wasm"; + const ADDER_PATH_EXPR: &str = "mxsc:test-contracts/adder.mxsc.json"; world.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder); world.set_state_step( @@ -734,7 +734,7 @@ fn test_deploy_and_upgrade_from_source() { const ADDER_OWNER_ADDRESS_EXPR: &str = "address:adder-owner"; const ADDER_ADDRESS_EXPR: &str = "sc:adder"; const NEW_ADDER_ADDRESS_EXPR: &str = "sc:new-adder"; - const ADDER_PATH_EXPR: &str = "file:test-contracts/adder.wasm"; + const ADDER_PATH_EXPR: &str = "mxsc:test-contracts/adder.mxsc.json"; world.register_contract(ADDER_PATH_EXPR, adder::ContractBuilder); world.set_state_step( @@ -817,7 +817,7 @@ fn test_deploy_and_upgrade_from_source() { let factorial_code = world.code_expression(FACTORIAL_PATH_EXPR); const FACTORIAL_ADDRESS_EXPR: &str = "sc:factorial"; - const FACTORIAL_PATH_EXPR: &str = "file:test-contracts/factorial.wasm"; + const FACTORIAL_PATH_EXPR: &str = "mxsc:test-contracts/factorial.mxsc.json"; world.register_contract(FACTORIAL_PATH_EXPR, factorial::ContractBuilder); world.set_state_step(SetStateStep::new().put_account( diff --git a/contracts/examples/order-book/pair/tests/pair_scenario_rs_test.rs b/contracts/examples/order-book/pair/tests/pair_scenario_rs_test.rs index a9dc12297f..c17ebaea2b 100644 --- a/contracts/examples/order-book/pair/tests/pair_scenario_rs_test.rs +++ b/contracts/examples/order-book/pair/tests/pair_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/examples/order-book/pair"); blockchain.register_contract( - "file:output/order-book-pair.wasm", + "mxsc:output/order-book-pair.mxsc.json", order_book_pair::ContractBuilder, ); blockchain diff --git a/contracts/examples/ping-pong-egld/tests/ping_pong_egld_scenario_rs_test.rs b/contracts/examples/ping-pong-egld/tests/ping_pong_egld_scenario_rs_test.rs index fb7c98bedb..ccec7f5ca9 100644 --- a/contracts/examples/ping-pong-egld/tests/ping_pong_egld_scenario_rs_test.rs +++ b/contracts/examples/ping-pong-egld/tests/ping_pong_egld_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/examples/ping-pong-egld"); blockchain.register_contract( - "file:output/ping-pong-egld.wasm", + "mxsc:output/ping-pong-egld.mxsc.json", ping_pong_egld::ContractBuilder, ); blockchain diff --git a/contracts/examples/proxy-pause/scenarios/init.scen.json b/contracts/examples/proxy-pause/scenarios/init.scen.json index 5d9ea233ea..e086e6e2ad 100644 --- a/contracts/examples/proxy-pause/scenarios/init.scen.json +++ b/contracts/examples/proxy-pause/scenarios/init.scen.json @@ -12,7 +12,7 @@ "sc:check-pause": { "nonce": "1", "balance": "0", - "code": "file:../../check-pause/output/check-pause.wasm", + "code": "mxsc:../../check-pause/output/check-pause.mxsc.json", "owner": "sc:proxy-pause" } }, diff --git a/contracts/examples/proxy-pause/tests/proxy_pause_scenario_rs_test.rs b/contracts/examples/proxy-pause/tests/proxy_pause_scenario_rs_test.rs index 63d81f0fbd..874c939739 100644 --- a/contracts/examples/proxy-pause/tests/proxy_pause_scenario_rs_test.rs +++ b/contracts/examples/proxy-pause/tests/proxy_pause_scenario_rs_test.rs @@ -4,10 +4,10 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/proxy-pause"); - blockchain.register_contract("file:output/proxy-pause.wasm", proxy_pause::ContractBuilder); + blockchain.register_contract("mxsc:output/proxy-pause.mxsc.json", proxy_pause::ContractBuilder); blockchain.register_contract( - "file:../check-pause/output/check-pause.wasm", + "mxsc:../check-pause/output/check-pause.mxsc.json", check_pause::ContractBuilder, ); blockchain diff --git a/contracts/examples/token-release/tests/token_release_scenario_rs_test.rs b/contracts/examples/token-release/tests/token_release_scenario_rs_test.rs index ca1a7cad5a..57f8c4a142 100644 --- a/contracts/examples/token-release/tests/token_release_scenario_rs_test.rs +++ b/contracts/examples/token-release/tests/token_release_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/examples/token-release"); blockchain.register_contract( - "file:output/token-release.wasm", + "mxsc:output/token-release.mxsc.json", token_release::ContractBuilder, ); blockchain diff --git a/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_rs_test.rs b/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_rs_test.rs index 69ad5b573f..1a8f09c226 100644 --- a/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_rs_test.rs +++ b/contracts/feature-tests/alloc-features/tests/alloc_features_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/feature-tests/alloc-features"); blockchain.register_contract( - "file:output/alloc-features.wasm", + "mxsc:output/alloc-features.mxsc.json", alloc_features::ContractBuilder, ); diff --git a/contracts/feature-tests/basic-features/interact/src/bf_interact.rs b/contracts/feature-tests/basic-features/interact/src/bf_interact.rs index 652f15022c..ceca3ace12 100644 --- a/contracts/feature-tests/basic-features/interact/src/bf_interact.rs +++ b/contracts/feature-tests/basic-features/interact/src/bf_interact.rs @@ -61,7 +61,7 @@ impl BasicFeaturesInteract { .await; let wallet_address = interactor.register_wallet(test_wallets::mike()); let code_expr = BytesValue::interpret_from( - "file:../output/basic-features-storage-bytes.wasm", + "mxsc:../output/basic-features-storage-bytes.mxsc.json", &InterpreterContext::default(), ); diff --git a/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs index de5da320e3..5f3c418aaf 100644 --- a/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs +++ b/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs @@ -5,11 +5,11 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/feature-tests/basic-features"); blockchain.register_contract( - "file:output/basic-features.wasm", + "mxsc:output/basic-features.mxsc.json", basic_features::ContractBuilder, ); blockchain.register_contract( - "file:../esdt-system-sc-mock/output/esdt-system-sc-mock.wasm", + "mxsc:../esdt-system-sc-mock/output/esdt-system-sc-mock.mxsc.json", esdt_system_sc_mock::ContractBuilder, ); diff --git a/contracts/feature-tests/big-float-features/tests/big_float_scenario_rs_test.rs b/contracts/feature-tests/big-float-features/tests/big_float_scenario_rs_test.rs index 5bf7e4d21f..0c5d6383fa 100644 --- a/contracts/feature-tests/big-float-features/tests/big_float_scenario_rs_test.rs +++ b/contracts/feature-tests/big-float-features/tests/big_float_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/feature-tests/big-float-features"); blockchain.register_contract( - "file:output/big-float-features.wasm", + "mxsc:output/big-float-features.mxsc.json", big_float_features::ContractBuilder, ); diff --git a/contracts/feature-tests/composability/esdt-contract-pair/tests/scenario_rs_test.rs b/contracts/feature-tests/composability/esdt-contract-pair/tests/scenario_rs_test.rs index 2181443dce..74d345daf7 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/tests/scenario_rs_test.rs +++ b/contracts/feature-tests/composability/esdt-contract-pair/tests/scenario_rs_test.rs @@ -3,12 +3,12 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.register_contract( - "file:first-contract/output/first-contract.wasm", + "mxsc:first-contract/output/first-contract.mxsc.json", first_contract::ContractBuilder, ); blockchain.register_contract( - "file:second-contract/output/second-contract.wasm", + "mxsc:second-contract/output/second-contract.mxsc.json", second_contract::ContractBuilder, ); blockchain diff --git a/contracts/feature-tests/composability/interact/src/comp_interact_controller.rs b/contracts/feature-tests/composability/interact/src/comp_interact_controller.rs index aa3b427df1..f5851d6e6c 100644 --- a/contracts/feature-tests/composability/interact/src/comp_interact_controller.rs +++ b/contracts/feature-tests/composability/interact/src/comp_interact_controller.rs @@ -29,11 +29,11 @@ impl ComposabilityInteract { .await; let wallet_address = interactor.register_wallet(judy()); let forw_queue_code = BytesValue::interpret_from( - "file:../forwarder-queue/output/forwarder-queue.wasm", + "mxsc:../forwarder-queue/output/forwarder-queue.mxsc.json", &InterpreterContext::default(), ); let vault_code = BytesValue::interpret_from( - "file:../vault/output/vault.wasm", + "mxsc:../vault/output/vault.mxsc.json", &InterpreterContext::default(), ); diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json index 042cb3f1a1..6594b4f71e 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json @@ -40,7 +40,7 @@ "to": "sc:forwarder", "function": "deploy_contract", "arguments": [ - "file:../vault/output/vault.wasm" + "mxsc:../vault/output/vault.mxsc.json" ], "gasLimit": "50,000,000", "gasPrice": "0" @@ -77,7 +77,7 @@ "to": "sc:forwarder", "function": "deploy_contract", "arguments": [ - "file:../vault/output/vault.wasm", + "mxsc:../vault/output/vault.mxsc.json", "str:some_argument" ], "gasLimit": "50,000,000", diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json index db90ad1c44..0c6c164872 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json @@ -50,7 +50,7 @@ "function": "call_upgrade", "arguments": [ "sc:child", - "file:../vault/output/vault.wasm", + "mxsc:../vault/output/vault.mxsc.json", "str:upgrade-init-arg" ], "gasLimit": "500,000,000", diff --git a/contracts/feature-tests/composability/scenarios/forwarder_contract_deploy.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_contract_deploy.scen.json index d2526c599d..546edd3c23 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_contract_deploy.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_contract_deploy.scen.json @@ -50,7 +50,7 @@ "to": "sc:forwarder", "function": "deploy_contract", "arguments": [ - "file:../vault/output/vault.wasm" + "mxsc:../vault/output/vault.mxsc.json" ], "gasLimit": "50,000,000", "gasPrice": "0" @@ -86,7 +86,7 @@ "to": "sc:forwarder", "function": "deploy_contract", "arguments": [ - "file:../vault/output/vault.wasm", + "mxsc:../vault/output/vault.mxsc.json", "str:some_argument" ], "gasLimit": "50,000,000", @@ -124,7 +124,7 @@ "to": "sc:forwarder", "function": "deploy_two_contracts", "arguments": [ - "file:../vault/output/vault.wasm" + "mxsc:../vault/output/vault.mxsc.json" ], "gasLimit": "80,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json index 35e9a1aa3d..712ab11352 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json @@ -51,7 +51,7 @@ "function": "upgradeVault", "arguments": [ "sc:child", - "file:../vault/output/vault.wasm" + "mxsc:../vault/output/vault.mxsc.json" ], "gasLimit": "500,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_init.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_init.scen.json index b334698541..aa7d48b42b 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_init.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_init.scen.json @@ -31,7 +31,7 @@ "egldValue": "100", "function": "deploySecondContract", "arguments": [ - "file:../proxy-test-second/output/proxy-test-second.wasm" + "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" ], "gasLimit": "1,000,000,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json b/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json index a2efb5de8e..f91f2c60d8 100644 --- a/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json +++ b/contracts/feature-tests/composability/scenarios/proxy_test_upgrade.scen.json @@ -23,7 +23,7 @@ "egldValue": "200", "function": "upgradeSecondContract", "arguments": [ - "file:../proxy-test-second/output/proxy-test-second.wasm" + "mxsc:../proxy-test-second/output/proxy-test-second.mxsc.json" ], "gasLimit": "1,000,000,000,000", "gasPrice": "0" diff --git a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs index a4b9aae3d8..2f53cd0a58 100644 --- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs +++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs @@ -5,34 +5,34 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/feature-tests/composability"); blockchain.register_contract( - "file:forwarder-queue/output/forwarder-queue.wasm", + "mxsc:forwarder-queue/output/forwarder-queue.mxsc.json", forwarder_queue::ContractBuilder, ); blockchain.register_contract( - "file:forwarder/output/forwarder.wasm", + "mxsc:forwarder/output/forwarder.mxsc.json", forwarder::ContractBuilder, ); blockchain.register_contract( - "file:forwarder-raw/output/forwarder-raw.wasm", + "mxsc:forwarder-raw/output/forwarder-raw.mxsc.json", forwarder_raw::ContractBuilder, ); blockchain.register_contract( - "file:promises-features/output/promises-features.wasm", + "mxsc:promises-features/output/promises-features.mxsc.json", promises_features::ContractBuilder, ); blockchain.register_contract( - "file:proxy-test-first/output/proxy-test-first.wasm", + "mxsc:proxy-test-first/output/proxy-test-first.mxsc.json", proxy_test_first::ContractBuilder, ); blockchain.register_contract( - "file:proxy-test-second/output/proxy-test-second.wasm", + "mxsc:proxy-test-second/output/proxy-test-second.mxsc.json", proxy_test_second::ContractBuilder, ); blockchain.register_contract( - "file:recursive-caller/output/recursive-caller.wasm", + "mxsc:recursive-caller/output/recursive-caller.mxsc.json", recursive_caller::ContractBuilder, ); - blockchain.register_contract("file:vault/output/vault.wasm", vault::ContractBuilder); + blockchain.register_contract("mxsc:vault/output/vault.mxsc.json", vault::ContractBuilder); blockchain } diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/tests/crowdfunding_erc20_scenario_rs_test.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/tests/crowdfunding_erc20_scenario_rs_test.rs index 998f538371..189a41f27c 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/tests/crowdfunding_erc20_scenario_rs_test.rs +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/tests/crowdfunding_erc20_scenario_rs_test.rs @@ -7,11 +7,11 @@ fn world() -> ScenarioWorld { ); blockchain.register_contract( - "file:output/crowdfunding-erc20.wasm", + "mxsc:output/crowdfunding-erc20.mxsc.json", crowdfunding_erc20::ContractBuilder, ); - blockchain.register_contract("file:../erc20/output/erc20.wasm", erc20::ContractBuilder); + blockchain.register_contract("mxsc:../erc20/output/erc20.mxsc.json", erc20::ContractBuilder); blockchain } diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/tests/erc1155_marketplace_scenario_rs_test.rs b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/tests/erc1155_marketplace_scenario_rs_test.rs index 5c7c6630cd..3c19930d4d 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/tests/erc1155_marketplace_scenario_rs_test.rs +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/tests/erc1155_marketplace_scenario_rs_test.rs @@ -3,11 +3,11 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.register_contract( - "file:output/erc1155-marketplace.wasm", + "mxsc:output/erc1155-marketplace.mxsc.json", erc1155_marketplace::ContractBuilder, ); blockchain.register_contract( - "file:../erc1155/output/erc1155.wasm", + "mxsc:../erc1155/output/erc1155.mxsc.json", erc1155::ContractBuilder, ); diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/tests/erc1155_scenario_rs_test.rs b/contracts/feature-tests/erc-style-contracts/erc1155/tests/erc1155_scenario_rs_test.rs index 5f751e1b6f..46d25e9447 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/tests/erc1155_scenario_rs_test.rs +++ b/contracts/feature-tests/erc-style-contracts/erc1155/tests/erc1155_scenario_rs_test.rs @@ -2,9 +2,9 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); - blockchain.register_contract("file:output/erc1155.wasm", erc1155::ContractBuilder); + blockchain.register_contract("mxsc:output/erc1155.mxsc.json", erc1155::ContractBuilder); blockchain.register_contract( - "file:../erc1155-user-mock/output/erc1155-user-mock.wasm", + "mxsc:../erc1155-user-mock/output/erc1155-user-mock.mxsc.json", erc1155_user_mock::ContractBuilder, ); diff --git a/contracts/feature-tests/erc-style-contracts/erc20/tests/erc20_scenario_rs_test.rs b/contracts/feature-tests/erc-style-contracts/erc20/tests/erc20_scenario_rs_test.rs index 3877ef0ad6..eb68d00d2e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/tests/erc20_scenario_rs_test.rs +++ b/contracts/feature-tests/erc-style-contracts/erc20/tests/erc20_scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/feature-tests/erc-style-contracts/erc20"); - blockchain.register_contract("file:output/erc20.wasm", erc20::ContractBuilder); + blockchain.register_contract("mxsc:output/erc20.mxsc.json", erc20::ContractBuilder); blockchain } diff --git a/contracts/feature-tests/erc-style-contracts/erc721/tests/nft_scenario_rs_test.rs b/contracts/feature-tests/erc-style-contracts/erc721/tests/nft_scenario_rs_test.rs index 9d07877d7d..043a19ff36 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/tests/nft_scenario_rs_test.rs +++ b/contracts/feature-tests/erc-style-contracts/erc721/tests/nft_scenario_rs_test.rs @@ -2,7 +2,7 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); - blockchain.register_contract("file:output/erc721.wasm", erc721::ContractBuilder); + blockchain.register_contract("mxsc:output/erc721.mxsc.json", erc721::ContractBuilder); blockchain } diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/tests/lottery_erc20_scenario_rs_test.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/tests/lottery_erc20_scenario_rs_test.rs index 00b24c22d6..7d958d67f8 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/tests/lottery_erc20_scenario_rs_test.rs +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/tests/lottery_erc20_scenario_rs_test.rs @@ -7,11 +7,11 @@ fn world() -> ScenarioWorld { ); blockchain.register_contract( - "file:output/lottery-erc20.wasm", + "mxsc:output/lottery-erc20.mxsc.json", lottery_erc20::ContractBuilder, ); - blockchain.register_contract("file:../erc20/output/erc20.wasm", erc20::ContractBuilder); + blockchain.register_contract("mxsc:../erc20/output/erc20.mxsc.json", erc20::ContractBuilder); blockchain } diff --git a/contracts/feature-tests/formatted-message-features/tests/msg_scenario_rs_test.rs b/contracts/feature-tests/formatted-message-features/tests/msg_scenario_rs_test.rs index dc366a6812..929ddd5c7c 100644 --- a/contracts/feature-tests/formatted-message-features/tests/msg_scenario_rs_test.rs +++ b/contracts/feature-tests/formatted-message-features/tests/msg_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/feature-tests/formatted-message-features"); blockchain.register_contract( - "file:output/formatted-message-features.wasm", + "mxsc:output/formatted-message-features.mxsc.json", formatted_message_features::ContractBuilder, ); diff --git a/contracts/feature-tests/managed-map-features/tests/managed_map_scenario_rs_test.rs b/contracts/feature-tests/managed-map-features/tests/managed_map_scenario_rs_test.rs index 89965a21e6..78defc0fcf 100644 --- a/contracts/feature-tests/managed-map-features/tests/managed_map_scenario_rs_test.rs +++ b/contracts/feature-tests/managed-map-features/tests/managed_map_scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/feature-tests/managed-map-features"); blockchain.register_contract( - "file:output/managed-map-features.wasm", + "mxsc:output/managed-map-features.mxsc.json", managed_map_features::ContractBuilder, ); blockchain diff --git a/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_rs_test.rs b/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_rs_test.rs index 0b086419f7..5c56c275d5 100644 --- a/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_rs_test.rs +++ b/contracts/feature-tests/multi-contract-features/tests/multi_contract_scenario_rs_test.rs @@ -5,17 +5,17 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/feature-tests/multi-contract-features"); blockchain.register_partial_contract::( - "file:output/multi-contract-features.wasm", + "mxsc:output/multi-contract-features.mxsc.json", multi_contract_features::ContractBuilder, "multi-contract-features", ); blockchain.register_partial_contract::( - "file:output/multi-contract-features-view.wasm", + "mxsc:output/multi-contract-features-view.mxsc.json", multi_contract_features::ContractBuilder, "multi-contract-features-view", ); blockchain.register_partial_contract::( - "file:output/multi-contract-alt-impl.wasm", + "mxsc:output/multi-contract-alt-impl.mxsc.json", multi_contract_features::ContractBuilder, "multi-contract-alt-impl", ); diff --git a/contracts/feature-tests/panic-message-features/scenarios/panic-after-log.scen.json b/contracts/feature-tests/panic-message-features/scenarios/panic-after-log.scen.json index 66803229e3..c652454513 100644 --- a/contracts/feature-tests/panic-message-features/scenarios/panic-after-log.scen.json +++ b/contracts/feature-tests/panic-message-features/scenarios/panic-after-log.scen.json @@ -8,7 +8,7 @@ "sc:panic_features": { "nonce": "0", "balance": "0", - "code": "file:../output/panic-message-features.wasm" + "code": "mxsc:../output/panic-message-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -53,7 +53,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/panic-message-features.wasm" + "code": "mxsc:../output/panic-message-features.mxsc.json" }, "address:an_account": { "nonce": "1", diff --git a/contracts/feature-tests/panic-message-features/tests/pmf_scenario_rs_test.rs b/contracts/feature-tests/panic-message-features/tests/pmf_scenario_rs_test.rs index 35d2d98dc4..2f9355f0d1 100644 --- a/contracts/feature-tests/panic-message-features/tests/pmf_scenario_rs_test.rs +++ b/contracts/feature-tests/panic-message-features/tests/pmf_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/feature-tests/panic-message-features"); blockchain.register_partial_contract::( - "file:output/panic-message-features.wasm", + "mxsc:output/panic-message-features.mxsc.json", panic_message_features::ContractBuilder, "panic-message-features", ); diff --git a/contracts/feature-tests/payable-features/tests/payable_blackbox_test.rs b/contracts/feature-tests/payable-features/tests/payable_blackbox_test.rs index ce8ec7ea25..6d86ebe77f 100644 --- a/contracts/feature-tests/payable-features/tests/payable_blackbox_test.rs +++ b/contracts/feature-tests/payable-features/tests/payable_blackbox_test.rs @@ -1,6 +1,6 @@ use multiversx_sc_scenario::{scenario_model::*, *}; -const PF_PATH_EXPR: &str = "file:output/payable-features.wasm"; +const PF_PATH_EXPR: &str = "mxsc:output/payable-features.mxsc.json"; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); diff --git a/contracts/feature-tests/payable-features/tests/payable_scenario_rs_test.rs b/contracts/feature-tests/payable-features/tests/payable_scenario_rs_test.rs index 975f72c72c..4e88c1cd75 100644 --- a/contracts/feature-tests/payable-features/tests/payable_scenario_rs_test.rs +++ b/contracts/feature-tests/payable-features/tests/payable_scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/feature-tests/payable-features"); blockchain.register_contract( - "file:output/payable-features.wasm", + "mxsc:output/payable-features.mxsc.json", payable_features::ContractBuilder, ); blockchain diff --git a/contracts/feature-tests/rust-snippets-generator-test/interact-rs/src/interactor_main.rs b/contracts/feature-tests/rust-snippets-generator-test/interact-rs/src/interactor_main.rs index 0f3958a635..e0999b7644 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/interact-rs/src/interactor_main.rs +++ b/contracts/feature-tests/rust-snippets-generator-test/interact-rs/src/interactor_main.rs @@ -74,7 +74,7 @@ impl State { "bech32:".to_string() + SC_ADDRESS }; let contract_code = BytesValue::interpret_from( - "file:../output/rust-snippets-generator-test.wasm", + "mxsc:../output/rust-snippets-generator-test.mxsc.json", &InterpreterContext::default(), ); let contract = ContractType::new(sc_addr_expr); diff --git a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json index 20b7c37006..571cfc7225 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json +++ b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json @@ -13,8 +13,7 @@ "accounts": { "0x0000000000000000fb1397e8225ea85e0f0e6e8c7b126d0016ccbde0e667151e": { "balance": "0", - "code": "mxsc:../output/rust-testing-framework-tester.mxsc.json", - "developerRewards": "0" + "code": "file:../output/rust-testing-framework-tester.wasm" } } }, @@ -27,7 +26,7 @@ "storage": { "str:totalValue": "0x01" }, - "code": "mxsc:../output/rust-testing-framework-tester.mxsc.json", + "code": "file:../output/rust-testing-framework-tester.wasm", "developerRewards": "0" } } diff --git a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json index fada9d8ecb..293b6b9c74 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json +++ b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json @@ -5,8 +5,7 @@ "accounts": { "0x00000000000000006c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925": { "balance": "0", - "code": "mxsc:../output/rust-testing-framework-tester.mxsc.json", - "developerRewards": "0" + "code": "file:../output/rust-testing-framework-tester.wasm" } } }, @@ -28,7 +27,7 @@ ] } }, - "code": "mxsc:../output/rust-testing-framework-tester.mxsc.json", + "code": "file:../output/rust-testing-framework-tester.wasm", "developerRewards": "0" } } diff --git a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_multiple_sc.scen.json b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_multiple_sc.scen.json index b69d81a9c4..027f682b12 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_multiple_sc.scen.json +++ b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_multiple_sc.scen.json @@ -5,8 +5,7 @@ "accounts": { "0x00000000000000006c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925": { "balance": "0", - "code": "mxsc:../output/rust-testing-framework-tester.mxsc.json", - "developerRewards": "0" + "code": "file:../output/rust-testing-framework-tester.wasm" } } }, @@ -15,8 +14,7 @@ "accounts": { "0x0000000000000000fb1397e8225ea85e0f0e6e8c7b126d0016ccbde0e667151e": { "balance": "0", - "code": "mxsc:../../../examples/adder/output/adder.mxsc.json", - "developerRewards": "0" + "code": "file:../../../examples/adder/output/adder.wasm" } } } diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs index 18aac012c7..353a7e9b84 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs +++ b/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs @@ -5,6 +5,10 @@ fn world() -> ScenarioWorld { blockchain .set_current_dir_from_workspace("contracts/feature-tests/rust-testing-framework-tester"); + blockchain.register_contract( + "mxsc:output/rust-testing-framework-tester.mxsc.json", + rust_testing_framework_tester::ContractBuilder, + ); blockchain.register_contract( "file:output/rust-testing-framework-tester.wasm", rust_testing_framework_tester::ContractBuilder, diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_blackbox_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_blackbox_test.rs index a53f1aa83b..d544af3a04 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/tests/tester_blackbox_test.rs +++ b/contracts/feature-tests/rust-testing-framework-tester/tests/tester_blackbox_test.rs @@ -1,7 +1,7 @@ use multiversx_sc_scenario::{api::StaticApi, scenario_model::*, *}; use rust_testing_framework_tester::*; // TODO: clean up imports -const WASM_PATH_EXPR: &str = "file:output/rust-testing-framework-tester.wasm"; +const WASM_PATH_EXPR: &str = "mxsc:output/rust-testing-framework-tester.mxsc.json"; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); diff --git a/contracts/feature-tests/use-module/scenarios/use_module_dns_register.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_dns_register.scen.json index 024a26147d..2a5698fe03 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_dns_register.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_dns_register.scen.json @@ -20,7 +20,7 @@ "storage": { "str:registration_cost": "1000" }, - "code": "file:../test-wasm/elrond-wasm-sc-dns.wasm" + "code": "mxsc:../test-wasm/elrond-wasm-sc-dns.mxsc.json" } } }, diff --git a/contracts/feature-tests/use-module/tests/use_module_scenario_rs_test.rs b/contracts/feature-tests/use-module/tests/use_module_scenario_rs_test.rs index c5748252dd..0b48711aa5 100644 --- a/contracts/feature-tests/use-module/tests/use_module_scenario_rs_test.rs +++ b/contracts/feature-tests/use-module/tests/use_module_scenario_rs_test.rs @@ -33,10 +33,10 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); - blockchain.register_contract("file:output/use-module.wasm", use_module::ContractBuilder); + blockchain.register_contract("mxsc:output/use-module.mxsc.json", use_module::ContractBuilder); blockchain.register_contract( - "file:test-wasm/elrond-wasm-sc-dns.wasm", + "mxsc:test-wasm/elrond-wasm-sc-dns.mxsc.json", dns_mock::ContractBuilder, ); diff --git a/framework/scenario/tests/contract_without_macros.rs b/framework/scenario/tests/contract_without_macros.rs index 039b606a83..cff92ceab8 100644 --- a/framework/scenario/tests/contract_without_macros.rs +++ b/framework/scenario/tests/contract_without_macros.rs @@ -443,7 +443,7 @@ fn contract_without_macros_basic() { fn world() -> multiversx_sc_scenario::ScenarioWorld { let mut blockchain = multiversx_sc_scenario::ScenarioWorld::new(); blockchain.register_contract( - "file:../../contracts/examples/adder/output/adder.wasm", + "mxsc:../../contracts/examples/adder/output/adder.mxsc.json", sample_adder::ContractBuilder, ); blockchain diff --git a/framework/scenario/tests/scenarios-io/example_normalized.scen.json b/framework/scenario/tests/scenarios-io/example_normalized.scen.json index e506eef27d..39f73bd18f 100644 --- a/framework/scenario/tests/scenarios-io/example_normalized.scen.json +++ b/framework/scenario/tests/scenarios-io/example_normalized.scen.json @@ -152,7 +152,7 @@ ] } }, - "code": "file:smart-contract.wasm", + "code": "mxsc:smart-contract.mxsc.json", "owner": "address:alice", "developerRewards": "100" } @@ -437,7 +437,7 @@ "str:anything-goes": "*", "+": "" }, - "code": "file:smart-contract.wasm", + "code": "mxsc:smart-contract.mxsc.json", "owner": "address:bob" }, "address:smart_contract_address_2": { diff --git a/framework/scenario/tests/scenarios-io/example_raw.scen.json b/framework/scenario/tests/scenarios-io/example_raw.scen.json index adcb971db3..a143c9765c 100644 --- a/framework/scenario/tests/scenarios-io/example_raw.scen.json +++ b/framework/scenario/tests/scenarios-io/example_raw.scen.json @@ -153,7 +153,7 @@ ] } }, - "code": "file:smart-contract.wasm", + "code": "mxsc:smart-contract.mxsc.json", "owner": "address:alice", "developerRewards": "100" } @@ -465,7 +465,7 @@ "str:anything-goes": "*", "+": "" }, - "code": "file:smart-contract.wasm", + "code": "mxsc:smart-contract.mxsc.json", "owner": "address:bob" }, "address:smart_contract_address_2": { diff --git a/sdk/scenario-format/src/value_interpreter/prefixes.rs b/sdk/scenario-format/src/value_interpreter/prefixes.rs index 7896bcf2a6..584b73433f 100644 --- a/sdk/scenario-format/src/value_interpreter/prefixes.rs +++ b/sdk/scenario-format/src/value_interpreter/prefixes.rs @@ -3,9 +3,9 @@ pub(super) const STR_PREFIXES: &[&str] = &["str:", "``", "''"]; pub(super) const ADDR_PREFIX: &str = "address:"; pub(super) const SC_ADDR_PREFIX: &str = "sc:"; pub(super) const FILE_PREFIX: &str = "file:"; +pub(super) const MXSC_PREFIX: &str = "mxsc:"; pub(super) const KECCAK256_PREFIX: &str = "keccak256:"; pub(super) const BECH32_PREFIX: &str = "bech32:"; -pub(super) const MXSC_PREFIX: &str = "mxsc:"; pub(super) const U64_PREFIX: &str = "u64:"; pub(super) const U32_PREFIX: &str = "u32:"; From bb2b97ed716d0113fcdb6d1e6153d2dc3b33d81d Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Wed, 20 Dec 2023 13:57:28 +0200 Subject: [PATCH 16/84] Create FrameworkVersion and macro for known versions --- Cargo.lock | 1 + framework/meta/Cargo.toml | 1 + framework/meta/src/lib.rs | 1 + framework/meta/src/version.rs | 31 +++++++++++++++++++++++++++ framework/meta/src/version_history.rs | 10 +++++++++ 5 files changed, 44 insertions(+) create mode 100644 framework/meta/src/version.rs diff --git a/Cargo.lock b/Cargo.lock index 125e16d31b..9bcd49c57a 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -1916,6 +1916,7 @@ dependencies = [ "reqwest", "ruplacer", "rustc_version", + "semver", "serde", "serde_json", "toml", diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml index 7a832566d9..20fd9b89a8 100644 --- a/framework/meta/Cargo.toml +++ b/framework/meta/Cargo.toml @@ -42,6 +42,7 @@ convert_case = "0.6.0" hex = "0.4" wasmparser = "0.118.1" wasmprinter = "0.2.71" +semver = "1.0.20" ruplacer = { version = "0.8.1", default-features = false, optional = true } reqwest = { version = "0.11.4", features = ["blocking", "json"], optional = true } diff --git a/framework/meta/src/lib.rs b/framework/meta/src/lib.rs index 601021ae3d..6d34abf4bd 100644 --- a/framework/meta/src/lib.rs +++ b/framework/meta/src/lib.rs @@ -10,6 +10,7 @@ mod print_util; mod tools; pub use tools::find_workspace; pub mod version_history; +pub mod version; #[macro_use] extern crate lazy_static; diff --git a/framework/meta/src/version.rs b/framework/meta/src/version.rs new file mode 100644 index 0000000000..2ae54d650d --- /dev/null +++ b/framework/meta/src/version.rs @@ -0,0 +1,31 @@ +use semver::{BuildMetadata, Prerelease, Version}; + +pub struct FrameworkVersion { + pub version: Version, +} + +impl FrameworkVersion { + pub fn new(major: i8, minor: i16, patch: i16) -> Self { + let version = Version { + major: major.try_into().unwrap(), + minor: minor.try_into().unwrap(), + patch: patch.try_into().unwrap(), + pre: Prerelease::EMPTY, + build: BuildMetadata::EMPTY, + }; + + FrameworkVersion { version } + } +} + +#[macro_export] +macro_rules! known_versions { + ($($v:literal),*) => { + [$( + { + let version: Vec<&str> = $v.split('.').collect(); + FrameworkVersion::new(version[0].parse().unwrap(),version[1].parse().unwrap(),version[2].parse().unwrap()) + } + ),*] + }; +} diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index 3bbe74cef2..6e282ae837 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -125,6 +125,8 @@ pub fn versions_iter(last_version: String) -> VersionIterator { #[cfg(test)] pub mod tests { + use crate::{known_versions, version::FrameworkVersion}; + use super::*; #[test] @@ -150,4 +152,12 @@ pub mod tests { assert!(is_template_with_autogenerated_json("0.44.0")); assert!(!is_template_with_autogenerated_json("0.43.0")); } + + #[test] + fn framework_version_test() { + let expecte_version = FrameworkVersion::new(1, 4, 5); + let versions = known_versions!("1.4.5", "2.3.4"); + + assert_eq!(versions[0].version, expecte_version.version); + } } From 9b9e6177e64008ee34ff014a0856c3f0751dc273 Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Wed, 3 Jan 2024 09:53:25 +0200 Subject: [PATCH 17/84] quote doesn't work when is called in version_history --- .../derive/src/format/format_args_macro.rs | 28 +++++++++++++++++++ framework/derive/src/lib.rs | 5 ++++ framework/meta/src/version.rs | 22 +++++++-------- framework/meta/src/version_history.rs | 16 +++++++---- 4 files changed, 54 insertions(+), 17 deletions(-) diff --git a/framework/derive/src/format/format_args_macro.rs b/framework/derive/src/format/format_args_macro.rs index 5e0ea07b63..8cbfae67e3 100644 --- a/framework/derive/src/format/format_args_macro.rs +++ b/framework/derive/src/format/format_args_macro.rs @@ -65,3 +65,31 @@ pub fn format_receiver_args_macro(input: proc_macro::TokenStream) -> proc_macro: } }).collect() } + +pub fn format_receiver_vers(input: proc_macro::TokenStream) -> proc_macro::TokenStream { + let tokens: Vec = format_tokenize::tokenize(input); + + let collected_tokens: Vec = tokens + .iter() + .map(|token| match token { + proc_macro::TokenTree::Group(_lit) => { + let format_string = _lit.to_string(); + let dot_count = format_string.chars().filter(|&c| c == '.').count(); + + if dot_count != 2 { + panic!("The argument does not have the required format."); + } + let str_as_bytes = byte_str_literal(format_string.as_bytes()); + + // quote!(FrameworkVersion::new($str_as_bytes);) + + quote!(multiversx_sc_meta::version::FrameworkVersion::new($str_as_bytes);) + }, + _ => panic!("Tokentree does not match with the requirements"), + }) + .collect(); + + let result: proc_macro::TokenStream = collected_tokens.into_iter().collect(); + + result +} diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs index 95d98b09a4..0056352bed 100644 --- a/framework/derive/src/lib.rs +++ b/framework/derive/src/lib.rs @@ -62,3 +62,8 @@ pub fn managed_vec_item_derive(input: proc_macro::TokenStream) -> proc_macro::To pub fn format_receiver_args(input: proc_macro::TokenStream) -> proc_macro::TokenStream { format::format_receiver_args_macro(input) } + +#[proc_macro] +pub fn format_version(input: proc_macro::TokenStream) -> proc_macro::TokenStream { + format::format_receiver_vers(input) +} diff --git a/framework/meta/src/version.rs b/framework/meta/src/version.rs index 2ae54d650d..8aac2fd1d5 100644 --- a/framework/meta/src/version.rs +++ b/framework/meta/src/version.rs @@ -5,11 +5,14 @@ pub struct FrameworkVersion { } impl FrameworkVersion { - pub fn new(major: i8, minor: i16, patch: i16) -> Self { + pub fn new(version_bytes: &[u8]) -> Self { + let version_str = String::from_utf8_lossy(version_bytes).to_string(); + let version_arr: Vec<&str> = version_str.split('.').collect(); + let version = Version { - major: major.try_into().unwrap(), - minor: minor.try_into().unwrap(), - patch: patch.try_into().unwrap(), + major: version_arr[0].parse().unwrap(), + minor: version_arr[1].parse().unwrap(), + patch: version_arr[2].parse().unwrap(), pre: Prerelease::EMPTY, build: BuildMetadata::EMPTY, }; @@ -19,13 +22,8 @@ impl FrameworkVersion { } #[macro_export] -macro_rules! known_versions { - ($($v:literal),*) => { - [$( - { - let version: Vec<&str> = $v.split('.').collect(); - FrameworkVersion::new(version[0].parse().unwrap(),version[1].parse().unwrap(),version[2].parse().unwrap()) - } - ),*] +macro_rules! sc_version { + ($($arg:expr),+ $(,)?) => { + multiversx_sc::derive::format_version!($($arg),+); }; } diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index 6e282ae837..ddf41917c7 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -1,3 +1,6 @@ +use crate::sc_version; +use crate::version::FrameworkVersion; + /// The last version to be used for upgrades and templates. /// /// Should be edited every time a new version of the framework is released. @@ -60,6 +63,11 @@ pub fn template_versions() -> &'static [&'static str] { &VERSIONS[33..] } +/// We started supporting contract templates with version 0.43.0. +pub fn template_versions_with_proc_macro() -> () { + sc_version!(0.43.0); +} + pub fn validate_template_tag(tag: &str) -> bool { template_versions().iter().any(|&tt| tt == tag) } @@ -125,7 +133,7 @@ pub fn versions_iter(last_version: String) -> VersionIterator { #[cfg(test)] pub mod tests { - use crate::{known_versions, version::FrameworkVersion}; + use crate::sc_version; use super::*; @@ -155,9 +163,7 @@ pub mod tests { #[test] fn framework_version_test() { - let expecte_version = FrameworkVersion::new(1, 4, 5); - let versions = known_versions!("1.4.5", "2.3.4"); - - assert_eq!(versions[0].version, expecte_version.version); + sc_version!(0.28.0, 0.29.0); + sc_version!(0.1.123, 2.2.12, 1.1.1); } } From 9d2aa13f24893c160734886fd1ed816b6c0e8c7e Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Wed, 3 Jan 2024 20:33:23 +0200 Subject: [PATCH 18/84] add unsanitzed quote, moved the function that uses the macro in the same source where the macro is defined -- still doesn't work --- framework/derive/src/format/format_args_macro.rs | 8 ++++---- framework/meta/src/version.rs | 7 ++++++- framework/meta/src/version_history.rs | 14 ++++++-------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/framework/derive/src/format/format_args_macro.rs b/framework/derive/src/format/format_args_macro.rs index 8cbfae67e3..d831c68b5a 100644 --- a/framework/derive/src/format/format_args_macro.rs +++ b/framework/derive/src/format/format_args_macro.rs @@ -80,10 +80,10 @@ pub fn format_receiver_vers(input: proc_macro::TokenStream) -> proc_macro::Token panic!("The argument does not have the required format."); } let str_as_bytes = byte_str_literal(format_string.as_bytes()); - - // quote!(FrameworkVersion::new($str_as_bytes);) - - quote!(multiversx_sc_meta::version::FrameworkVersion::new($str_as_bytes);) + + quote!( + FrameworkVersion::new($str_as_bytes); + ) }, _ => panic!("Tokentree does not match with the requirements"), }) diff --git a/framework/meta/src/version.rs b/framework/meta/src/version.rs index 8aac2fd1d5..1cb9b8a11f 100644 --- a/framework/meta/src/version.rs +++ b/framework/meta/src/version.rs @@ -21,9 +21,14 @@ impl FrameworkVersion { } } -#[macro_export] +// #[macro_use] macro_rules! sc_version { ($($arg:expr),+ $(,)?) => { multiversx_sc::derive::format_version!($($arg),+); }; } + +pub fn template_versions_with_proc_macro() { + // self::FrameworkVersion::new("0.1.1"); + sc_version!(0.43.0); +} diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index ddf41917c7..64bba98683 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -1,6 +1,3 @@ -use crate::sc_version; -use crate::version::FrameworkVersion; - /// The last version to be used for upgrades and templates. /// /// Should be edited every time a new version of the framework is released. @@ -64,9 +61,10 @@ pub fn template_versions() -> &'static [&'static str] { } /// We started supporting contract templates with version 0.43.0. -pub fn template_versions_with_proc_macro() -> () { - sc_version!(0.43.0); -} +// pub fn template_versions_with_proc_macro() { +// sc_version!(0.43.0); +// // self::FrameworkVersion::new("1.2.2"); +// } pub fn validate_template_tag(tag: &str) -> bool { template_versions().iter().any(|&tt| tt == tag) @@ -163,7 +161,7 @@ pub mod tests { #[test] fn framework_version_test() { - sc_version!(0.28.0, 0.29.0); - sc_version!(0.1.123, 2.2.12, 1.1.1); + // sc_version!(0.28.0, 0.29.0); + // sc_version!(0.1.123, 2.2.12, 1.1.1); } } From 2fefeb4d41feea53195268b493db4dee792868dd Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 5 Jan 2024 12:19:43 +0200 Subject: [PATCH 19/84] FrameworkVersion array via version_triple macro --- .../derive/src/format/format_args_macro.rs | 38 +++++++++-------- framework/derive/src/lib.rs | 4 +- framework/meta/src/version.rs | 41 +++++++++++++++---- 3 files changed, 57 insertions(+), 26 deletions(-) diff --git a/framework/derive/src/format/format_args_macro.rs b/framework/derive/src/format/format_args_macro.rs index d831c68b5a..05f5b24cc4 100644 --- a/framework/derive/src/format/format_args_macro.rs +++ b/framework/derive/src/format/format_args_macro.rs @@ -1,4 +1,4 @@ -use proc_macro::quote; +use proc_macro::{quote, Literal}; use crate::{format::format_tokenize, generate::util::byte_str_literal}; @@ -66,30 +66,36 @@ pub fn format_receiver_args_macro(input: proc_macro::TokenStream) -> proc_macro: }).collect() } -pub fn format_receiver_vers(input: proc_macro::TokenStream) -> proc_macro::TokenStream { +pub fn version_triple(input: proc_macro::TokenStream) -> proc_macro::TokenStream { let tokens: Vec = format_tokenize::tokenize(input); - let collected_tokens: Vec = tokens + tokens .iter() .map(|token| match token { - proc_macro::TokenTree::Group(_lit) => { - let format_string = _lit.to_string(); - let dot_count = format_string.chars().filter(|&c| c == '.').count(); + proc_macro::TokenTree::Group(lit) => { + let format_string = lit.stream().to_string(); + + let version_tokens: Vec<&str> = format_string.split('.').collect(); + assert!( + version_tokens.len() == 3, + "The argument does not have the required format." + ); + + let major = u64_literal_from_str(version_tokens[0]); + let minor = u64_literal_from_str(version_tokens[1]); + let patch = u64_literal_from_str(version_tokens[2]); - if dot_count != 2 { - panic!("The argument does not have the required format."); - } - let str_as_bytes = byte_str_literal(format_string.as_bytes()); - quote!( - FrameworkVersion::new($str_as_bytes); + ($major, $minor, $patch) ) }, _ => panic!("Tokentree does not match with the requirements"), }) - .collect(); - - let result: proc_macro::TokenStream = collected_tokens.into_iter().collect(); + .collect() +} - result +fn u64_literal_from_str(s: &str) -> proc_macro::TokenTree { + proc_macro::TokenTree::Literal(Literal::u64_suffixed( + s.parse().expect("failed to parse token as u64"), + )) } diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs index 0056352bed..446e95a61f 100644 --- a/framework/derive/src/lib.rs +++ b/framework/derive/src/lib.rs @@ -64,6 +64,6 @@ pub fn format_receiver_args(input: proc_macro::TokenStream) -> proc_macro::Token } #[proc_macro] -pub fn format_version(input: proc_macro::TokenStream) -> proc_macro::TokenStream { - format::format_receiver_vers(input) +pub fn version_triple(input: proc_macro::TokenStream) -> proc_macro::TokenStream { + format::version_triple(input) } diff --git a/framework/meta/src/version.rs b/framework/meta/src/version.rs index 1cb9b8a11f..1ab61f1718 100644 --- a/framework/meta/src/version.rs +++ b/framework/meta/src/version.rs @@ -5,8 +5,7 @@ pub struct FrameworkVersion { } impl FrameworkVersion { - pub fn new(version_bytes: &[u8]) -> Self { - let version_str = String::from_utf8_lossy(version_bytes).to_string(); + pub fn parse(version_str: &str) -> Self { let version_arr: Vec<&str> = version_str.split('.').collect(); let version = Version { @@ -19,16 +18,42 @@ impl FrameworkVersion { FrameworkVersion { version } } + + pub const fn new(major: u64, minor: u64, patch: u64) -> Self { + let version = Version { + major, + minor, + patch, + pre: Prerelease::EMPTY, + build: BuildMetadata::EMPTY, + }; + + FrameworkVersion { version } + } + + pub const fn from_triple(triple: (u64, u64, u64)) -> Self { + let (major, minor, patch) = triple; + FrameworkVersion::new(major, minor, patch) + } } + + // #[macro_use] -macro_rules! sc_version { - ($($arg:expr),+ $(,)?) => { - multiversx_sc::derive::format_version!($($arg),+); +macro_rules! framework_version { + ($arg:expr) => { + FrameworkVersion::from_triple(multiversx_sc::derive::version_triple!($arg)) }; } -pub fn template_versions_with_proc_macro() { - // self::FrameworkVersion::new("0.1.1"); - sc_version!(0.43.0); +// #[macro_use] +macro_rules! framework_versions { + ($($arg:expr),+ $(,)?) => { + &[$(framework_version!($arg)),+] + }; } + +const V123: FrameworkVersion = framework_version!(1.2.3); +const ALL: &[FrameworkVersion] = framework_versions!(1.2.3, 3.4.5); + + From 014c738f0cd175f3fe9098ffcedb21e0c07bb025 Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Fri, 5 Jan 2024 18:13:51 +0200 Subject: [PATCH 20/84] Add test that checks versions are sorted --- framework/meta/src/version.rs | 48 +++++++++++++++------------ framework/meta/src/version_history.rs | 21 +++++++----- 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/framework/meta/src/version.rs b/framework/meta/src/version.rs index 1ab61f1718..bcac6f742f 100644 --- a/framework/meta/src/version.rs +++ b/framework/meta/src/version.rs @@ -1,24 +1,13 @@ +use std::cmp::Ordering; + use semver::{BuildMetadata, Prerelease, Version}; +#[derive(Debug, Clone, Eq)] pub struct FrameworkVersion { pub version: Version, } impl FrameworkVersion { - pub fn parse(version_str: &str) -> Self { - let version_arr: Vec<&str> = version_str.split('.').collect(); - - let version = Version { - major: version_arr[0].parse().unwrap(), - minor: version_arr[1].parse().unwrap(), - patch: version_arr[2].parse().unwrap(), - pre: Prerelease::EMPTY, - build: BuildMetadata::EMPTY, - }; - - FrameworkVersion { version } - } - pub const fn new(major: u64, minor: u64, patch: u64) -> Self { let version = Version { major, @@ -37,23 +26,40 @@ impl FrameworkVersion { } } +impl Ord for FrameworkVersion { + fn cmp(&self, other: &Self) -> Ordering { + self.version.cmp(&other.version) + } +} + +impl PartialOrd for FrameworkVersion { + fn partial_cmp(&self, other: &Self) -> Option { + Some(self.cmp(other)) + } +} +impl PartialEq for FrameworkVersion { + fn eq(&self, other: &Self) -> bool { + self.version == other.version + } +} -// #[macro_use] +pub fn is_sorted(versions: &[FrameworkVersion]) -> bool { + versions + .windows(2) + .all(|window| (window[0].cmp(&window[1])).eq(&Ordering::Less)) +} + +#[macro_export] macro_rules! framework_version { ($arg:expr) => { FrameworkVersion::from_triple(multiversx_sc::derive::version_triple!($arg)) }; } -// #[macro_use] +#[macro_export] macro_rules! framework_versions { ($($arg:expr),+ $(,)?) => { &[$(framework_version!($arg)),+] }; } - -const V123: FrameworkVersion = framework_version!(1.2.3); -const ALL: &[FrameworkVersion] = framework_versions!(1.2.3, 3.4.5); - - diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index 64bba98683..76ec3ca91c 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -1,3 +1,5 @@ +use crate::{framework_version, framework_versions, version::FrameworkVersion}; + /// The last version to be used for upgrades and templates. /// /// Should be edited every time a new version of the framework is released. @@ -55,17 +57,18 @@ pub const VERSIONS: &[&str] = &[ "0.45.2", ]; +const ALL_VERSIONS: &[FrameworkVersion] = framework_versions![ + 0.28.0, 0.29.0, 0.29.2, 0.29.3, 0.30.0, 0.31.0, 0.31.1, 0.32.0, 0.33.0, 0.33.1, 0.34.0, 0.34.1, + 0.35.0, 0.36.0, 0.36.1, 0.37.0, 0.38.0, 0.39.0, 0.39.1, 0.39.2, 0.39.3, 0.39.4, 0.39.5, 0.39.6, + 0.39.7, 0.39.8, 0.40.0, 0.40.1, 0.41.0, 0.41.1, 0.41.2, 0.41.3, 0.42.0, 0.43.0, 0.43.1, 0.43.2, + 0.43.3, 0.43.4, 0.43.5, 0.44.0, 0.45.0, 0.45.2, +]; + /// We started supporting contract templates with version 0.43.0. pub fn template_versions() -> &'static [&'static str] { &VERSIONS[33..] } -/// We started supporting contract templates with version 0.43.0. -// pub fn template_versions_with_proc_macro() { -// sc_version!(0.43.0); -// // self::FrameworkVersion::new("1.2.2"); -// } - pub fn validate_template_tag(tag: &str) -> bool { template_versions().iter().any(|&tt| tt == tag) } @@ -131,7 +134,8 @@ pub fn versions_iter(last_version: String) -> VersionIterator { #[cfg(test)] pub mod tests { - use crate::sc_version; + + use crate::version::is_sorted; use super::*; @@ -161,7 +165,6 @@ pub mod tests { #[test] fn framework_version_test() { - // sc_version!(0.28.0, 0.29.0); - // sc_version!(0.1.123, 2.2.12, 1.1.1); + assert_eq!(is_sorted(ALL_VERSIONS), true); } } From 48726dad9291bfa5264f05353ad43637f2f5a006 Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Tue, 9 Jan 2024 08:17:57 +0200 Subject: [PATCH 21/84] replace with semver version p1 --- .../standalone/template/contract_creator.rs | 5 +++-- framework/meta/src/version.rs | 9 ++++++++ framework/meta/src/version_history.rs | 22 ++++++++++--------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/framework/meta/src/cmd/standalone/template/contract_creator.rs b/framework/meta/src/cmd/standalone/template/contract_creator.rs index 9b493b89fc..83fcfcc103 100644 --- a/framework/meta/src/cmd/standalone/template/contract_creator.rs +++ b/framework/meta/src/cmd/standalone/template/contract_creator.rs @@ -1,6 +1,6 @@ use crate::{ cli_args::TemplateArgs, - version_history::{validate_template_tag, LAST_TEMPLATE_VERSION}, + version_history::{validate_template_tag, LAST_TEMPLATE_VERSION}, version::FrameworkVersion, }; use super::{ @@ -31,7 +31,8 @@ fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget { pub(crate) fn get_repo_version(args_tag: &Option) -> RepoVersion { if let Some(tag) = args_tag { - assert!(validate_template_tag(tag), "invalid template tag"); + let tag_version: FrameworkVersion = FrameworkVersion::from_string_template(tag); + assert!(validate_template_tag(tag_version), "invalid template tag"); RepoVersion::Tag(tag.clone()) } else { RepoVersion::Tag(LAST_TEMPLATE_VERSION.to_string()) diff --git a/framework/meta/src/version.rs b/framework/meta/src/version.rs index bcac6f742f..3843384a4d 100644 --- a/framework/meta/src/version.rs +++ b/framework/meta/src/version.rs @@ -24,6 +24,15 @@ impl FrameworkVersion { let (major, minor, patch) = triple; FrameworkVersion::new(major, minor, patch) } + + pub fn from_string_template(version_str: &str) -> Self { + let version_arr: Vec<&str> = version_str.split('.').collect(); + let major: u64= version_arr[0].parse().unwrap(); + let minor: u64= version_arr[0].parse().unwrap(); + let patch: u64= version_arr[0].parse().unwrap(); + + FrameworkVersion::new(major, minor, patch) + } } impl Ord for FrameworkVersion { diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index 76ec3ca91c..d076633b5d 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -61,16 +61,17 @@ const ALL_VERSIONS: &[FrameworkVersion] = framework_versions![ 0.28.0, 0.29.0, 0.29.2, 0.29.3, 0.30.0, 0.31.0, 0.31.1, 0.32.0, 0.33.0, 0.33.1, 0.34.0, 0.34.1, 0.35.0, 0.36.0, 0.36.1, 0.37.0, 0.38.0, 0.39.0, 0.39.1, 0.39.2, 0.39.3, 0.39.4, 0.39.5, 0.39.6, 0.39.7, 0.39.8, 0.40.0, 0.40.1, 0.41.0, 0.41.1, 0.41.2, 0.41.3, 0.42.0, 0.43.0, 0.43.1, 0.43.2, - 0.43.3, 0.43.4, 0.43.5, 0.44.0, 0.45.0, 0.45.2, + 0.43.3, 0.43.4, 0.43.5, 0.44.0, 0.45.0, 0.45.2 ]; -/// We started supporting contract templates with version 0.43.0. -pub fn template_versions() -> &'static [&'static str] { - &VERSIONS[33..] -} +pub const LAST_TEMPLATE_VERSION_FV: FrameworkVersion = framework_version!(0.45.2); -pub fn validate_template_tag(tag: &str) -> bool { - template_versions().iter().any(|&tt| tt == tag) +pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0); + +/// We started supporting contract templates with version 0.43.0. +pub fn validate_template_tag(tag: FrameworkVersion) -> bool { + tag >= LOWER_VERSION_WITH_TEMPLATE_TAG && tag <= LAST_TEMPLATE_VERSION_FV + // template_versions().iter().any(|&tt| tt == tag) } pub fn template_versions_with_autogenerated_wasm() -> &'static [&'static str] { @@ -141,10 +142,11 @@ pub mod tests { #[test] fn template_versions_test() { - assert_eq!(template_versions()[0], "0.43.0"); + // assert_eq!(template_versions()[0], "0.43.0"); - assert!(validate_template_tag("0.43.0")); - assert!(!validate_template_tag("0.42.0")); + assert!(validate_template_tag(FrameworkVersion::new(0, 43, 0))); + assert!(!validate_template_tag(FrameworkVersion::new(0, 42, 0))); + assert!(!validate_template_tag(FrameworkVersion::new(0, 47, 0))); } #[test] From 50acdf99e37bc1e50d4225e9160493cb9b3419a4 Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Tue, 9 Jan 2024 13:25:34 +0200 Subject: [PATCH 22/84] is empty at address impl for set mapper and mandos testing --- Cargo.lock | 16 ++ Cargo.toml | 3 + .../storage_mapper_get_at_address.scen.json | 111 ++++++++++++ .../basic-features/src/basic_features_main.rs | 2 + .../src/storage_mapper_get_at_address.rs | 25 +++ ...s_storage_mapper_get_at_address_go_test.rs | 10 ++ .../Cargo.lock | 67 ------- .../basic-features/wasm/Cargo.lock | 67 ------- .../basic-features/wasm/src/lib.rs | 6 +- .../feature-tests/get-at-address/Cargo.toml | 17 ++ .../feature-tests/get-at-address/README.md | 3 + .../get-at-address/meta/Cargo.toml | 13 ++ .../get-at-address/meta/src/main.rs | 3 + .../get-at-address/multiversx.json | 3 + .../feature-tests/get-at-address/src/lib.rs | 24 +++ .../get-at-address/wasm/Cargo.lock | 170 ++++++++++++++++++ .../get-at-address/wasm/Cargo.toml | 32 ++++ .../get-at-address/wasm/src/lib.rs | 28 +++ .../base/src/storage/mappers/queue_mapper.rs | 20 ++- .../base/src/storage/mappers/set_mapper.rs | 6 +- 20 files changed, 486 insertions(+), 140 deletions(-) create mode 100644 contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json create mode 100644 contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs create mode 100644 contracts/feature-tests/basic-features/tests/basic_features_storage_mapper_get_at_address_go_test.rs create mode 100644 contracts/feature-tests/get-at-address/Cargo.toml create mode 100644 contracts/feature-tests/get-at-address/README.md create mode 100644 contracts/feature-tests/get-at-address/meta/Cargo.toml create mode 100644 contracts/feature-tests/get-at-address/meta/src/main.rs create mode 100644 contracts/feature-tests/get-at-address/multiversx.json create mode 100644 contracts/feature-tests/get-at-address/src/lib.rs create mode 100644 contracts/feature-tests/get-at-address/wasm/Cargo.lock create mode 100644 contracts/feature-tests/get-at-address/wasm/Cargo.toml create mode 100644 contracts/feature-tests/get-at-address/wasm/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 72fe0455c6..bc0e701b96 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -1204,6 +1204,22 @@ dependencies = [ "version_check", ] +[[package]] +name = "get-at-address" +version = "0.0.0" +dependencies = [ + "multiversx-sc", + "multiversx-sc-scenario", +] + +[[package]] +name = "get-at-address-meta" +version = "0.0.0" +dependencies = [ + "get-at-address", + "multiversx-sc-meta", +] + [[package]] name = "getrandom" version = "0.2.11" diff --git a/Cargo.toml b/Cargo.toml index ef92a8a7b9..a0fbb1b68f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -175,4 +175,7 @@ members = [ "contracts/feature-tests/rust-testing-framework-tester/meta", "contracts/feature-tests/use-module", "contracts/feature-tests/use-module/meta", + + "contracts/feature-tests/get-at-address", + "contracts/feature-tests/get-at-address/meta", ] diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json new file mode 100644 index 0000000000..93755d995d --- /dev/null +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json @@ -0,0 +1,111 @@ +{ + "name": "storage mapper get at address", + "gasSchedule": "v3", + "steps": [ + { + "step": "setState", + "accounts": { + "sc:basic-features": { + "nonce": "0", + "balance": "0", + "code": "file:../output/basic-features.wasm" + }, + "sc:get-at-address": { + "nonce": "0", + "balance": "0", + "code": "file:../../get-at-address/output/get-at-address.wasm" + }, + "address:an_account": { + "nonce": "0", + "balance": "0" + } + } + }, + { + "step": "scCall", + "id": "set contract address", + "tx": { + "from": "address:an_account", + "to": "sc:basic-features", + "function": "set_contract_address", + "arguments": [ + "sc:get-at-address" + ], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + }, + { + "step": "scCall", + "id": "fill set mapper", + "tx": { + "from": "address:an_account", + "to": "sc:get-at-address", + "function": "fill_set_mapper", + "arguments": [ + "10" + ], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + }, + { + "step": "checkState", + "accounts": { + "sc:basic-features": { + "nonce": "0", + "balance": "0", + "storage": { + "str:contract_address": "sc:get-at-address" + }, + "code": "file:../output/basic-features.wasm" + }, + "sc:get-at-address": { + "nonce": "0", + "balance": "0", + "storage": "*", + "code": "file:../../get-at-address/output/get-at-address.wasm" + }, + "address:an_account": { + "nonce": "*", + "balance": "*", + "storage": {}, + "code": "" + } + } + }, + { + "step": "scCall", + "id": "is empty at address", + "tx": { + "from": "address:an_account", + "to": "sc:basic-features", + "function": "is_empty_at_address", + "arguments": [], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [""], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + } + ] +} \ No newline at end of file diff --git a/contracts/feature-tests/basic-features/src/basic_features_main.rs b/contracts/feature-tests/basic-features/src/basic_features_main.rs index 4474a883b4..e98d5b0f26 100644 --- a/contracts/feature-tests/basic-features/src/basic_features_main.rs +++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs @@ -38,6 +38,7 @@ pub mod storage_raw_api_features; pub mod struct_eq; pub mod token_identifier_features; pub mod types; +pub mod storage_mapper_get_at_address; #[multiversx_sc::contract] pub trait BasicFeatures: @@ -76,6 +77,7 @@ pub trait BasicFeatures: + token_identifier_features::TokenIdentifierFeatures + non_zero_features::TypeFeatures + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule + + storage_mapper_get_at_address::StorageMapperGetAtAddress { #[init] fn init(&self) {} diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs new file mode 100644 index 0000000000..873ccb3e4c --- /dev/null +++ b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs @@ -0,0 +1,25 @@ +multiversx_sc::imports!(); +multiversx_sc::derive_imports!(); + +/// Module that calls another contract to read the content of a SetMapper remotely +#[multiversx_sc::module] +pub trait StorageMapperGetAtAddress { + + #[storage_mapper("empty_set_mapper")] + fn empty_set_mapper(&self) -> SetMapper; + + #[storage_mapper("contract_address")] + fn contract_address(&self) -> SingleValueMapper; + + #[endpoint] + fn set_contract_address(&self, address: ManagedAddress) { + self.contract_address().set(address) + } + + #[endpoint] + fn is_empty_at_address(&self) -> bool { + let mapper = self.empty_set_mapper(); + let contract_address = self.contract_address().get(); + mapper.is_empty_at_address(contract_address) + } +} diff --git a/contracts/feature-tests/basic-features/tests/basic_features_storage_mapper_get_at_address_go_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_storage_mapper_get_at_address_go_test.rs new file mode 100644 index 0000000000..ef457ce5ce --- /dev/null +++ b/contracts/feature-tests/basic-features/tests/basic_features_storage_mapper_get_at_address_go_test.rs @@ -0,0 +1,10 @@ +use multiversx_sc_scenario::*; + +fn world() -> ScenarioWorld { + ScenarioWorld::vm_go() +} + +#[test] +fn storage_mapper_get_at_address_go() { + world().run("scenarios/storage_mapper_get_at_address.scen.json"); +} \ No newline at end of file diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock index 1a71600472..c72fc0b961 100644 --- a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock +++ b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock @@ -2,24 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - [[package]] name = "arrayvec" version = "0.7.4" @@ -54,28 +36,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - [[package]] name = "endian-type" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", - "allocator-api2", -] - [[package]] name = "hex" version = "0.4.3" @@ -93,7 +59,6 @@ name = "multiversx-sc" version = "0.45.2" dependencies = [ "bitflags", - "hashbrown", "hex-literal", "multiversx-sc-codec", "multiversx-sc-derive", @@ -161,12 +126,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - [[package]] name = "proc-macro2" version = "1.0.70" @@ -217,29 +176,3 @@ name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "zerocopy" -version = "0.7.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock index 8a7789f299..0590ec08f5 100755 --- a/contracts/feature-tests/basic-features/wasm/Cargo.lock +++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock @@ -2,24 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "allocator-api2" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" - [[package]] name = "arrayvec" version = "0.7.4" @@ -54,28 +36,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - [[package]] name = "endian-type" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" -[[package]] -name = "hashbrown" -version = "0.14.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -dependencies = [ - "ahash", - "allocator-api2", -] - [[package]] name = "hex" version = "0.4.3" @@ -93,7 +59,6 @@ name = "multiversx-sc" version = "0.45.2" dependencies = [ "bitflags", - "hashbrown", "hex-literal", "multiversx-sc-codec", "multiversx-sc-derive", @@ -161,12 +126,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - [[package]] name = "proc-macro2" version = "1.0.70" @@ -217,29 +176,3 @@ name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "zerocopy" -version = "0.7.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs index 531da8b0bb..55372cba89 100644 --- a/contracts/feature-tests/basic-features/wasm/src/lib.rs +++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs @@ -5,9 +5,9 @@ //////////////////////////////////////////////////// // Init: 1 -// Endpoints: 368 +// Endpoints: 370 // Async Callback: 1 -// Total number of exported functions: 370 +// Total number of exported functions: 372 #![no_std] #![allow(internal_features)] @@ -388,6 +388,8 @@ multiversx_sc_wasm_adapter::endpoints! { token_identifier_is_valid_2 => token_identifier_is_valid_2 non_zero_usize_iter => non_zero_usize_iter non_zero_usize_macro => non_zero_usize_macro + set_contract_address => set_contract_address + is_empty_at_address => is_empty_at_address ) } diff --git a/contracts/feature-tests/get-at-address/Cargo.toml b/contracts/feature-tests/get-at-address/Cargo.toml new file mode 100644 index 0000000000..100bd48a93 --- /dev/null +++ b/contracts/feature-tests/get-at-address/Cargo.toml @@ -0,0 +1,17 @@ +[package] +name = "get-at-address" +version = "0.0.0" +authors = ["Andrei Marinica "] +edition = "2021" +publish = false + +[lib] +path = "src/lib.rs" + +[dependencies.multiversx-sc] +version = "0.45.2" +path = "../../../framework/base" + +[dev-dependencies.multiversx-sc-scenario] +version = "0.45.2" +path = "../../../framework/scenario" diff --git a/contracts/feature-tests/get-at-address/README.md b/contracts/feature-tests/get-at-address/README.md new file mode 100644 index 0000000000..c52cb7aac5 --- /dev/null +++ b/contracts/feature-tests/get-at-address/README.md @@ -0,0 +1,3 @@ +# Get At Address + +`Get At Address` is a simple Smart Contract meant to be called by the StorageGetAtAddress module of basic-features. diff --git a/contracts/feature-tests/get-at-address/meta/Cargo.toml b/contracts/feature-tests/get-at-address/meta/Cargo.toml new file mode 100644 index 0000000000..1f78220046 --- /dev/null +++ b/contracts/feature-tests/get-at-address/meta/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "get-at-address-meta" +version = "0.0.0" +edition = "2021" +publish = false + +[dependencies.get-at-address] +path = ".." + +[dependencies.multiversx-sc-meta] +version = "0.45.2" +path = "../../../../framework/meta" +default-features = false diff --git a/contracts/feature-tests/get-at-address/meta/src/main.rs b/contracts/feature-tests/get-at-address/meta/src/main.rs new file mode 100644 index 0000000000..eb6f026d97 --- /dev/null +++ b/contracts/feature-tests/get-at-address/meta/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + multiversx_sc_meta::cli_main::(); +} diff --git a/contracts/feature-tests/get-at-address/multiversx.json b/contracts/feature-tests/get-at-address/multiversx.json new file mode 100644 index 0000000000..7365539625 --- /dev/null +++ b/contracts/feature-tests/get-at-address/multiversx.json @@ -0,0 +1,3 @@ +{ + "language": "rust" +} \ No newline at end of file diff --git a/contracts/feature-tests/get-at-address/src/lib.rs b/contracts/feature-tests/get-at-address/src/lib.rs new file mode 100644 index 0000000000..c31889cef1 --- /dev/null +++ b/contracts/feature-tests/get-at-address/src/lib.rs @@ -0,0 +1,24 @@ +#![no_std] + +multiversx_sc::imports!(); +/// This contract's storage gets called by the StorageMapperGetAtAddress module of basic-features +#[multiversx_sc::contract] +pub trait GetAtAddress { + #[storage_mapper("set_mapper")] + fn set_mapper(&self) -> SetMapper; + + #[init] + fn init(&self) {} + + #[upgrade] + fn upgrade(&self) { + self.init(); + } + + #[endpoint] + fn fill_set_mapper(&self, value: u32) { + for item in 1u32..=value { + self.set_mapper().insert(item); + } + } +} diff --git a/contracts/feature-tests/get-at-address/wasm/Cargo.lock b/contracts/feature-tests/get-at-address/wasm/Cargo.lock new file mode 100644 index 0000000000..86333df601 --- /dev/null +++ b/contracts/feature-tests/get-at-address/wasm/Cargo.lock @@ -0,0 +1,170 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "endian-type" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" + +[[package]] +name = "get-at-address" +version = "0.0.0" +dependencies = [ + "multiversx-sc", +] + +[[package]] +name = "get-at-address-wasm" +version = "0.0.0" +dependencies = [ + "get-at-address", + "multiversx-sc-wasm-adapter", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" + +[[package]] +name = "multiversx-sc" +version = "0.45.2" +dependencies = [ + "bitflags", + "hex-literal", + "multiversx-sc-codec", + "multiversx-sc-derive", + "num-traits", +] + +[[package]] +name = "multiversx-sc-codec" +version = "0.18.3" +dependencies = [ + "arrayvec", + "multiversx-sc-codec-derive", +] + +[[package]] +name = "multiversx-sc-codec-derive" +version = "0.18.3" +dependencies = [ + "hex", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "multiversx-sc-derive" +version = "0.45.2" +dependencies = [ + "hex", + "proc-macro2", + "quote", + "radix_trie", + "syn", +] + +[[package]] +name = "multiversx-sc-wasm-adapter" +version = "0.45.2" +dependencies = [ + "multiversx-sc", +] + +[[package]] +name = "nibble_vec" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" +dependencies = [ + "smallvec", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "proc-macro2" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radix_trie" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" +dependencies = [ + "endian-type", + "nibble_vec", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" diff --git a/contracts/feature-tests/get-at-address/wasm/Cargo.toml b/contracts/feature-tests/get-at-address/wasm/Cargo.toml new file mode 100644 index 0000000000..944df6201f --- /dev/null +++ b/contracts/feature-tests/get-at-address/wasm/Cargo.toml @@ -0,0 +1,32 @@ +# Code generated by the multiversx-sc build system. DO NOT EDIT. + +# ########################################## +# ############## AUTO-GENERATED ############# +# ########################################## + +[package] +name = "get-at-address-wasm" +version = "0.0.0" +edition = "2021" +publish = false + +[lib] +crate-type = ["cdylib"] + +[profile.release] +codegen-units = 1 +opt-level = "z" +lto = true +debug = false +panic = "abort" +overflow-checks = false + +[dependencies.get-at-address] +path = ".." + +[dependencies.multiversx-sc-wasm-adapter] +version = "0.45.2" +path = "../../../../framework/wasm-adapter" + +[workspace] +members = ["."] diff --git a/contracts/feature-tests/get-at-address/wasm/src/lib.rs b/contracts/feature-tests/get-at-address/wasm/src/lib.rs new file mode 100644 index 0000000000..7c526bd7f6 --- /dev/null +++ b/contracts/feature-tests/get-at-address/wasm/src/lib.rs @@ -0,0 +1,28 @@ +// Code generated by the multiversx-sc build system. DO NOT EDIT. + +//////////////////////////////////////////////////// +////////////////// AUTO-GENERATED ////////////////// +//////////////////////////////////////////////////// + +// Init: 1 +// Endpoints: 2 +// Async Callback (empty): 1 +// Total number of exported functions: 4 + +#![no_std] +#![allow(internal_features)] +#![feature(lang_items)] + +multiversx_sc_wasm_adapter::allocator!(); +multiversx_sc_wasm_adapter::panic_handler!(); + +multiversx_sc_wasm_adapter::endpoints! { + get_at_address + ( + init => init + upgrade => upgrade + fill_set_mapper => fill_set_mapper + ) +} + +multiversx_sc_wasm_adapter::async_callback_empty! {} diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs index 6bfaacfeb3..9677ce1b94 100644 --- a/framework/base/src/storage/mappers/queue_mapper.rs +++ b/framework/base/src/storage/mappers/queue_mapper.rs @@ -3,15 +3,16 @@ use core::marker::PhantomData; use super::{StorageClearable, StorageMapper}; use crate::{ abi::{TypeAbi, TypeDescriptionContainer, TypeName}, - api::StorageMapperApi, + api::{StorageMapperApi, StorageReadApi, StorageReadApiImpl}, codec::{ self, derive::{TopDecode, TopDecodeOrDefault, TopEncode, TopEncodeOrDefault}, multi_encode_iter_or_handle_err, CodecFrom, DecodeDefault, EncodeDefault, EncodeErrorHandler, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput, }, - storage::{storage_get, storage_set, StorageKey}, - types::{ManagedType, MultiValueEncoded}, + contract_base::StorageRawWrapper, + storage::{storage_get, storage_get_from_address, storage_set, StorageKey}, + types::{ManagedAddress, ManagedType, MultiValueEncoded}, }; use alloc::vec::Vec; @@ -126,6 +127,15 @@ where storage_get(self.build_name_key(INFO_IDENTIFIER).as_ref()) } + fn get_info_at_address(&self, address: &ManagedAddress) -> QueueMapperInfo { + // storage_get_from_address::storage_get_from_address( + // address.as_ref(), + // self.build_name_key(INFO_IDENTIFIER).as_ref(), + // ) + let wrapper = StorageRawWrapper::new(); + wrapper.read_from_address(address, self.build_name_key(INFO_IDENTIFIER)) + } + fn set_info(&mut self, value: QueueMapperInfo) { storage_set(self.build_name_key(INFO_IDENTIFIER).as_ref(), &value); } @@ -190,6 +200,10 @@ where self.get_info().len == 0 } + pub fn is_empty_at_address(&self, address: &ManagedAddress) -> bool { + self.get_info_at_address(address).len == 0 + } + /// Returns the length of the `Queue`. /// /// This operation should compute in *O*(1) time. diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs index 127164136a..1408917253 100644 --- a/framework/base/src/storage/mappers/set_mapper.rs +++ b/framework/base/src/storage/mappers/set_mapper.rs @@ -10,7 +10,7 @@ use crate::{ NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput, }, storage::{storage_get, storage_set, StorageKey}, - types::{ManagedType, MultiValueEncoded}, + types::{ManagedType, MultiValueEncoded, ManagedAddress}, }; const NULL_ENTRY: u32 = 0; @@ -93,6 +93,10 @@ where self.queue_mapper.is_empty() } + pub fn is_empty_at_address(&self, address: ManagedAddress) -> bool { + self.queue_mapper.is_empty_at_address(&address) + } + /// Returns the number of elements in the set. pub fn len(&self) -> usize { self.queue_mapper.len() From dfe663178731af91574c7f64739fa5c425e1d8d0 Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Tue, 9 Jan 2024 14:01:04 +0200 Subject: [PATCH 23/84] build fix --- contracts/feature-tests/get-at-address/Cargo.toml | 4 ++-- contracts/feature-tests/get-at-address/meta/Cargo.toml | 2 +- contracts/feature-tests/get-at-address/wasm/Cargo.lock | 6 +++--- contracts/feature-tests/get-at-address/wasm/Cargo.toml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contracts/feature-tests/get-at-address/Cargo.toml b/contracts/feature-tests/get-at-address/Cargo.toml index 100bd48a93..04e9d1827e 100644 --- a/contracts/feature-tests/get-at-address/Cargo.toml +++ b/contracts/feature-tests/get-at-address/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.45.2" +version = "0.46.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.45.2" +version = "0.46.0" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/get-at-address/meta/Cargo.toml b/contracts/feature-tests/get-at-address/meta/Cargo.toml index 1f78220046..8df2577e6f 100644 --- a/contracts/feature-tests/get-at-address/meta/Cargo.toml +++ b/contracts/feature-tests/get-at-address/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.45.2" +version = "0.46.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/get-at-address/wasm/Cargo.lock b/contracts/feature-tests/get-at-address/wasm/Cargo.lock index 86333df601..00743b3d40 100644 --- a/contracts/feature-tests/get-at-address/wasm/Cargo.lock +++ b/contracts/feature-tests/get-at-address/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.45.2" +version = "0.46.0" dependencies = [ "bitflags", "hex-literal", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.45.2" +version = "0.46.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.45.2" +version = "0.46.0" dependencies = [ "multiversx-sc", ] diff --git a/contracts/feature-tests/get-at-address/wasm/Cargo.toml b/contracts/feature-tests/get-at-address/wasm/Cargo.toml index 944df6201f..d1cebf8fea 100644 --- a/contracts/feature-tests/get-at-address/wasm/Cargo.toml +++ b/contracts/feature-tests/get-at-address/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.45.2" +version = "0.46.0" path = "../../../../framework/wasm-adapter" [workspace] From 5049648649608ff1700d757c677e756cdbea5df1 Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Wed, 10 Jan 2024 21:47:05 +0200 Subject: [PATCH 24/84] progress on impl address for mappers --- .../base/src/storage/mappers/map_mapper.rs | 180 +++++++++---- .../src/storage/mappers/map_storage_mapper.rs | 148 ++++++++--- .../base/src/storage/mappers/queue_mapper.rs | 236 +++++++++++++++--- .../base/src/storage/mappers/set_mapper.rs | 150 ++++++++--- 4 files changed, 554 insertions(+), 160 deletions(-) diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs index 145ae6d4e3..489ba09619 100644 --- a/framework/base/src/storage/mappers/map_mapper.rs +++ b/framework/base/src/storage/mappers/map_mapper.rs @@ -1,33 +1,37 @@ use core::marker::PhantomData; -use super::{set_mapper, SetMapper, StorageClearable, StorageMapper}; +use super::{ + set_mapper::{self, StorageAddress, StorageSCAddress}, + SetMapper, StorageClearable, StorageMapper, +}; use crate::{ abi::{TypeAbi, TypeDescriptionContainer, TypeName}, - api::StorageMapperApi, + api::{StorageMapperApi, ManagedTypeApi}, codec::{ multi_encode_iter_or_handle_err, multi_types::MultiValue2, CodecFrom, EncodeErrorHandler, NestedDecode, NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput, }, storage::{storage_clear, storage_get, storage_set, StorageKey}, - types::{ManagedType, MultiValueEncoded}, + types::{ManagedType, MultiValueEncoded, ManagedAddress}, }; const MAPPED_VALUE_IDENTIFIER: &[u8] = b".mapped"; type Keys<'a, SA, T> = set_mapper::Iter<'a, SA, T>; -pub struct MapMapper +pub struct MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: TopEncode + TopDecode + 'static, { _phantom_api: PhantomData, base_key: StorageKey, - keys_set: SetMapper, + keys_set: SetMapper, _phantom_value: PhantomData, } -impl StorageMapper for MapMapper +impl StorageMapper for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -37,13 +41,13 @@ where MapMapper { _phantom_api: PhantomData, base_key: base_key.clone(), - keys_set: SetMapper::::new(base_key), + keys_set: SetMapper::new(base_key), _phantom_value: PhantomData, } } } -impl StorageClearable for MapMapper +impl StorageClearable for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -57,7 +61,7 @@ where } } -impl MapMapper +impl MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -101,7 +105,7 @@ where } /// Gets the given key's corresponding entry in the map for in-place manipulation. - pub fn entry(&mut self, key: K) -> Entry<'_, SA, K, V> { + pub fn entry(&mut self, key: K) -> Entry<'_, SA, StorageSCAddress, K, V> { if self.contains_key(&key) { Entry::Occupied(OccupiedEntry { key, @@ -151,18 +155,94 @@ where /// An iterator visiting all values in arbitrary order. /// The iterator element type is `&'a V`. - pub fn values(&self) -> Values { + pub fn values(&self) -> Values { Values::new(self) } /// An iterator visiting all key-value pairs in arbitrary order. /// The iterator element type is `(&'a K, &'a V)`. - pub fn iter(&self) -> Iter { + pub fn iter(&self) -> Iter { Iter::new(self) } } -impl<'a, SA, K, V> IntoIterator for &'a MapMapper +impl MapMapper, K, V> +where + SA: StorageMapperApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi, + V: TopEncode + TopDecode, +{ + fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey { + let mut named_key = self.base_key.clone(); + named_key.append_bytes(name); + named_key.append_item(key); + named_key + } + + fn get_mapped_value(&self, key: &K) -> V { + storage_get(self.build_named_key(MAPPED_VALUE_IDENTIFIER, key).as_ref()) + } + + /// Returns `true` if the map contains no elements. + pub fn is_empty(&self) -> bool { + self.keys_set.is_empty() + } + + /// Returns the number of elements in the map. + pub fn len(&self) -> usize { + self.keys_set.len() + } + + /// Returns `true` if the map contains a value for the specified key. + pub fn contains_key(&self, k: &K) -> bool { + self.keys_set.contains(k) + } + + /// Gets the given key's corresponding entry in the map for in-place manipulation. + pub fn entry(&mut self, key: K) -> Entry<'_, SA, ManagedAddress, K, V> { + if self.contains_key(&key) { + Entry::Occupied(OccupiedEntry { + key, + map: self, + _marker: PhantomData, + }) + } else { + Entry::Vacant(VacantEntry { + key, + map: self, + _marker: PhantomData, + }) + } + } + + /// Gets a reference to the value in the entry. + pub fn get(&self, k: &K) -> Option { + if self.keys_set.contains(k) { + return Some(self.get_mapped_value(k)); + } + None + } + + // An iterator visiting all keys in arbitrary order. + // The iterator element type is `&'a K`. + // pub fn keys(&self) -> Keys { + // self.keys_set.iter() + // } + + // An iterator visiting all values in arbitrary order. + // The iterator element type is `&'a V`. + // pub fn values(&self) -> Values, K, V> { + // Values::new(self) + // } + + // An iterator visiting all key-value pairs in arbitrary order. + // The iterator element type is `(&'a K, &'a V)`. + // pub fn iter(&self) -> Iter { + // Iter::new(self) + // } +} + +impl<'a, SA, K, V> IntoIterator for &'a MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -170,30 +250,31 @@ where { type Item = (K, V); - type IntoIter = Iter<'a, SA, K, V>; + type IntoIter = Iter<'a, SA, StorageSCAddress, K, V>; fn into_iter(self) -> Self::IntoIter { self.iter() } } -pub struct Iter<'a, SA, K, V> +pub struct Iter<'a, SA, A, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: TopEncode + TopDecode + 'static, { key_iter: Keys<'a, SA, K>, - hash_map: &'a MapMapper, + hash_map: &'a MapMapper, } -impl<'a, SA, K, V> Iter<'a, SA, K, V> +impl<'a, SA, K, V> Iter<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: TopEncode + TopDecode + 'static, { - fn new(hash_map: &'a MapMapper) -> Iter<'a, SA, K, V> { + fn new(hash_map: &'a MapMapper) -> Iter<'a, SA, StorageSCAddress, K, V> { Iter { key_iter: hash_map.keys(), hash_map, @@ -201,7 +282,7 @@ where } } -impl<'a, SA, K, V> Iterator for Iter<'a, SA, K, V> +impl<'a, SA, K, V> Iterator for Iter<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -219,23 +300,24 @@ where } } -pub struct Values<'a, SA, K, V> +pub struct Values<'a, SA, A, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: TopEncode + TopDecode + 'static, { key_iter: Keys<'a, SA, K>, - hash_map: &'a MapMapper, + hash_map: &'a MapMapper, } -impl<'a, SA, K, V> Values<'a, SA, K, V> +impl<'a, SA, K, V> Values<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: TopEncode + TopDecode + 'static, { - fn new(hash_map: &'a MapMapper) -> Values<'a, SA, K, V> { + fn new(hash_map: &'a MapMapper) -> Values<'a, SA, StorageSCAddress, K, V> { Values { key_iter: hash_map.keys(), hash_map, @@ -243,7 +325,7 @@ where } } -impl<'a, SA, K, V> Iterator for Values<'a, SA, K, V> +impl<'a, SA, K, V> Iterator for Values<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -261,29 +343,31 @@ where } } -pub enum Entry<'a, SA, K: 'a, V: 'a> +pub enum Entry<'a, SA, A, K: 'a, V: 'a> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: TopEncode + TopDecode + 'static, { /// A vacant entry. - Vacant(VacantEntry<'a, SA, K, V>), + Vacant(VacantEntry<'a, SA, A, K, V>), /// An occupied entry. - Occupied(OccupiedEntry<'a, SA, K, V>), + Occupied(OccupiedEntry<'a, SA, A, K, V>), } /// A view into a vacant entry in a `MapMapper`. /// It is part of the [`Entry`] enum. -pub struct VacantEntry<'a, SA, K: 'a, V: 'a> +pub struct VacantEntry<'a, SA, A, K: 'a, V: 'a> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: TopEncode + TopDecode + 'static, { pub(super) key: K, - pub(super) map: &'a mut MapMapper, + pub(super) map: &'a mut MapMapper, // Be invariant in `K` and `V` pub(super) _marker: PhantomData<&'a mut (K, V)>, @@ -291,28 +375,29 @@ where /// A view into an occupied entry in a `MapMapper`. /// It is part of the [`Entry`] enum. -pub struct OccupiedEntry<'a, SA, K: 'a, V: 'a> +pub struct OccupiedEntry<'a, SA, A, K: 'a, V: 'a> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: TopEncode + TopDecode + 'static, { pub(super) key: K, - pub(super) map: &'a mut MapMapper, + pub(super) map: &'a mut MapMapper, // Be invariant in `K` and `V` pub(super) _marker: PhantomData<&'a mut (K, V)>, } -impl<'a, SA, K, V> Entry<'a, SA, K, V> +impl<'a, SA, K, V> Entry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, - K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + ManagedTypeApi, V: TopEncode + TopDecode + 'static, { /// Ensures a value is in the entry by inserting the default if empty, and returns /// an `OccupiedEntry`. - pub fn or_insert(self, default: V) -> OccupiedEntry<'a, SA, K, V> { + pub fn or_insert(self, default: V) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert(default), @@ -321,7 +406,7 @@ where /// Ensures a value is in the entry by inserting the result of the default function if empty, /// and returns an `OccupiedEntry`. - pub fn or_insert_with V>(self, default: F) -> OccupiedEntry<'a, SA, K, V> { + pub fn or_insert_with V>(self, default: F) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert(default()), @@ -334,7 +419,10 @@ where /// /// The reference to the moved key is provided so that cloning or copying the key is /// unnecessary, unlike with `.or_insert_with(|| ... )`. - pub fn or_insert_with_key V>(self, default: F) -> OccupiedEntry<'a, SA, K, V> { + pub fn or_insert_with_key V>( + self, + default: F, + ) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => { @@ -368,15 +456,15 @@ where } } -impl<'a, SA, K, V: Default> Entry<'a, SA, K, V> +impl<'a, SA, K, V: Default> Entry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, - K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + ManagedTypeApi, V: TopEncode + TopDecode + 'static, { /// Ensures a value is in the entry by inserting the default value if empty, /// and returns an `OccupiedEntry`. - pub fn or_default(self) -> OccupiedEntry<'a, SA, K, V> { + pub fn or_default(self) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert(Default::default()), @@ -384,10 +472,10 @@ where } } -impl<'a, SA, K, V> VacantEntry<'a, SA, K, V> +impl<'a, SA, K, V> VacantEntry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, - K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + ManagedTypeApi, V: TopEncode + TopDecode + 'static, { /// Gets a reference to the key that would be used when inserting a value @@ -398,7 +486,7 @@ where /// Sets the value of the entry with the `VacantEntry`'s key, /// and returns an `OccupiedEntry`. - pub fn insert(self, value: V) -> OccupiedEntry<'a, SA, K, V> { + pub fn insert(self, value: V) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { self.map.insert(self.key.clone(), value); OccupiedEntry { key: self.key, @@ -408,7 +496,7 @@ where } } -impl<'a, SA, K, V> OccupiedEntry<'a, SA, K, V> +impl<'a, SA, K, V> OccupiedEntry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, @@ -453,7 +541,7 @@ where } /// Behaves like a MultiResultVec> when an endpoint result. -impl TopEncodeMulti for MapMapper +impl TopEncodeMulti for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -469,7 +557,7 @@ where } } -impl CodecFrom> for MultiValueEncoded> +impl CodecFrom> for MultiValueEncoded> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -478,7 +566,7 @@ where } /// Behaves like a MultiResultVec> when an endpoint result. -impl TypeAbi for MapMapper +impl TypeAbi for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi + 'static, diff --git a/framework/base/src/storage/mappers/map_storage_mapper.rs b/framework/base/src/storage/mappers/map_storage_mapper.rs index 23acfaf2cb..1aa36631b7 100644 --- a/framework/base/src/storage/mappers/map_storage_mapper.rs +++ b/framework/base/src/storage/mappers/map_storage_mapper.rs @@ -1,28 +1,32 @@ use core::marker::PhantomData; -use super::{set_mapper, SetMapper, StorageClearable, StorageMapper}; +use super::{ + set_mapper::{self, StorageAddress, StorageSCAddress}, + SetMapper, StorageClearable, StorageMapper, +}; use crate::{ - api::StorageMapperApi, + api::{StorageMapperApi, ManagedTypeApi}, codec::{NestedDecode, NestedEncode, TopDecode, TopEncode}, - storage::{self, StorageKey}, + storage::{self, StorageKey}, types::ManagedAddress, }; const MAPPED_STORAGE_VALUE_IDENTIFIER: &[u8] = b".storage"; type Keys<'a, SA, T> = set_mapper::Iter<'a, SA, T>; -pub struct MapStorageMapper +pub struct MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: StorageMapper + StorageClearable, { _phantom_api: PhantomData, base_key: StorageKey, - keys_set: SetMapper, + keys_set: SetMapper, _phantom_value: PhantomData, } -impl StorageMapper for MapStorageMapper +impl StorageMapper for MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -32,13 +36,13 @@ where Self { _phantom_api: PhantomData, base_key: base_key.clone(), - keys_set: SetMapper::::new(base_key), + keys_set: SetMapper::new(base_key), _phantom_value: PhantomData, } } } -impl StorageClearable for MapStorageMapper +impl StorageClearable for MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -52,7 +56,7 @@ where } } -impl MapStorageMapper +impl MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -94,7 +98,7 @@ where } /// Gets the given key's corresponding entry in the map for in-place manipulation. - pub fn entry(&mut self, key: K) -> Entry { + pub fn entry(&mut self, key: K) -> Entry { if self.contains_key(&key) { Entry::Occupied(OccupiedEntry { key, @@ -140,18 +144,79 @@ where /// An iterator visiting all values in arbitrary order. /// The iterator element type is `&'a V`. - pub fn values(&self) -> Values { + pub fn values(&self) -> Values { Values::new(self) } /// An iterator visiting all key-value pairs in arbitrary order. /// The iterator element type is `(&'a K, &'a V)`. - pub fn iter(&self) -> Iter { + pub fn iter(&self) -> Iter { Iter::new(self) } } -impl<'a, SA, K, V> IntoIterator for &'a MapStorageMapper +impl MapStorageMapper, K, V> +where + SA: StorageMapperApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi, + V: StorageMapper + StorageClearable, +{ + fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey { + let mut named_key = self.base_key.clone(); + named_key.append_bytes(name); + named_key.append_item(key); + named_key + } + + fn get_mapped_storage_value(&self, key: &K) -> V { + let key = self.build_named_key(MAPPED_STORAGE_VALUE_IDENTIFIER, key); + >::new(key) + } + + /// Returns `true` if the map contains no elements. + pub fn is_empty(&self) -> bool { + self.keys_set.is_empty() + } + + /// Returns the number of elements in the map. + pub fn len(&self) -> usize { + self.keys_set.len() + } + + /// Returns `true` if the map contains a value for the specified key. + pub fn contains_key(&self, k: &K) -> bool { + self.keys_set.contains(k) + } + + /// Gets a reference to the value in the entry. + pub fn get(&self, k: &K) -> Option { + if self.keys_set.contains(k) { + return Some(self.get_mapped_storage_value(k)); + } + None + } + + /// Gets the given key's corresponding entry in the map for in-place manipulation. + pub fn entry(&mut self, key: K) -> Entry, K, V> { + if self.contains_key(&key) { + Entry::Occupied(OccupiedEntry { + key, + map: self, + _marker: PhantomData, + }) + } else { + Entry::Vacant(VacantEntry { + key, + map: self, + _marker: PhantomData, + }) + } + } + + +} + +impl<'a, SA, K, V> IntoIterator for &'a MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -159,30 +224,33 @@ where { type Item = (K, V); - type IntoIter = Iter<'a, SA, K, V>; + type IntoIter = Iter<'a, SA, StorageSCAddress, K, V>; fn into_iter(self) -> Self::IntoIter { self.iter() } } -pub struct Iter<'a, SA, K, V> +pub struct Iter<'a, SA, A, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: StorageMapper + StorageClearable, { key_iter: Keys<'a, SA, K>, - hash_map: &'a MapStorageMapper, + hash_map: &'a MapStorageMapper, } -impl<'a, SA, K, V> Iter<'a, SA, K, V> +impl<'a, SA, K, V> Iter<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: StorageMapper + StorageClearable, { - fn new(hash_map: &'a MapStorageMapper) -> Iter<'a, SA, K, V> { + fn new( + hash_map: &'a MapStorageMapper, + ) -> Iter<'a, SA, StorageSCAddress, K, V> { Iter { key_iter: hash_map.keys(), hash_map, @@ -190,7 +258,7 @@ where } } -impl<'a, SA, K, V> Iterator for Iter<'a, SA, K, V> +impl<'a, SA, K, V> Iterator for Iter<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -208,23 +276,24 @@ where } } -pub struct Values<'a, SA, K, V> +pub struct Values<'a, SA, A, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: StorageMapper + StorageClearable, { key_iter: Keys<'a, SA, K>, - hash_map: &'a MapStorageMapper, + hash_map: &'a MapStorageMapper, } -impl<'a, SA, K, V> Values<'a, SA, K, V> +impl<'a, SA, K, V> Values<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: StorageMapper + StorageClearable, { - fn new(hash_map: &'a MapStorageMapper) -> Values<'a, SA, K, V> { + fn new(hash_map: &'a MapStorageMapper) -> Values<'a, SA, StorageSCAddress, K, V> { Values { key_iter: hash_map.keys(), hash_map, @@ -232,7 +301,7 @@ where } } -impl<'a, SA, K, V> Iterator for Values<'a, SA, K, V> +impl<'a, SA, K, V> Iterator for Values<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -250,29 +319,31 @@ where } } -pub enum Entry<'a, SA, K: 'a, V: 'a> +pub enum Entry<'a, SA, A, K: 'a, V: 'a> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: StorageMapper + StorageClearable, { /// A vacant entry. - Vacant(VacantEntry<'a, SA, K, V>), + Vacant(VacantEntry<'a, SA, A, K, V>), /// An occupied entry. - Occupied(OccupiedEntry<'a, SA, K, V>), + Occupied(OccupiedEntry<'a, SA, A, K, V>), } /// A view into a vacant entry in a `MapStorageMapper`. /// It is part of the [`Entry`] enum. -pub struct VacantEntry<'a, SA, K: 'a, V: 'a> +pub struct VacantEntry<'a, SA, A, K: 'a, V: 'a> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: StorageMapper + StorageClearable, { pub(super) key: K, - pub(super) map: &'a mut MapStorageMapper, + pub(super) map: &'a mut MapStorageMapper, // Be invariant in `K` and `V` pub(super) _marker: PhantomData<&'a mut (K, V)>, @@ -280,20 +351,21 @@ where /// A view into an occupied entry in a `MapStorageMapper`. /// It is part of the [`Entry`] enum. -pub struct OccupiedEntry<'a, SA, K: 'a, V: 'a> +pub struct OccupiedEntry<'a, SA, A, K: 'a, V: 'a> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + A: StorageAddress, V: StorageMapper + StorageClearable, { pub(super) key: K, - pub(super) map: &'a mut MapStorageMapper, + pub(super) map: &'a mut MapStorageMapper, // Be invariant in `K` and `V` pub(super) _marker: PhantomData<&'a mut (K, V)>, } -impl<'a, SA, K, V> Entry<'a, SA, K, V> +impl<'a, SA, K, V> Entry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, @@ -301,7 +373,7 @@ where { /// Ensures a value is in the entry by inserting the default if empty, and returns /// an `OccupiedEntry`. - pub fn or_insert_default(self) -> OccupiedEntry<'a, SA, K, V> { + pub fn or_insert_default(self) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert_default(), @@ -332,7 +404,7 @@ where } } -impl<'a, SA, K, V> Entry<'a, SA, K, V> +impl<'a, SA, K, V> Entry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, @@ -340,7 +412,7 @@ where { /// Ensures a value is in the entry by inserting the default value if empty, /// and returns an `OccupiedEntry`. - pub fn or_default(self) -> OccupiedEntry<'a, SA, K, V> { + pub fn or_default(self) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert_default(), @@ -348,7 +420,7 @@ where } } -impl<'a, SA, K, V> VacantEntry<'a, SA, K, V> +impl<'a, SA, K, V> VacantEntry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, @@ -362,7 +434,7 @@ where /// Sets the value of the entry with the `VacantEntry`'s key, /// and returns an `OccupiedEntry`. - pub fn insert_default(self) -> OccupiedEntry<'a, SA, K, V> { + pub fn insert_default(self) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { self.map.insert_default(self.key.clone()); OccupiedEntry { key: self.key, @@ -372,7 +444,7 @@ where } } -impl<'a, SA, K, V> OccupiedEntry<'a, SA, K, V> +impl<'a, SA, K, V> OccupiedEntry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs index 9677ce1b94..e08bec2283 100644 --- a/framework/base/src/storage/mappers/queue_mapper.rs +++ b/framework/base/src/storage/mappers/queue_mapper.rs @@ -1,9 +1,12 @@ use core::marker::PhantomData; -use super::{StorageClearable, StorageMapper}; +use super::{ + set_mapper::{StorageAddress, StorageSCAddress}, + StorageClearable, StorageMapper, +}; use crate::{ abi::{TypeAbi, TypeDescriptionContainer, TypeName}, - api::{StorageMapperApi, StorageReadApi, StorageReadApiImpl}, + api::{ManagedTypeApi, StorageMapperApi, StorageReadApi, StorageReadApiImpl}, codec::{ self, derive::{TopDecode, TopDecodeOrDefault, TopEncode, TopEncodeOrDefault}, @@ -15,6 +18,7 @@ use crate::{ types::{ManagedAddress, ManagedType, MultiValueEncoded}, }; use alloc::vec::Vec; +use codec::{NestedDecode, NestedEncode}; const NULL_ENTRY: u32 = 0; const INFO_IDENTIFIER: &[u8] = b".info"; @@ -34,6 +38,13 @@ pub struct QueueMapperInfo { pub back: u32, pub new: u32, } +impl NestedEncode for Node {} + +impl NestedDecode for Node {} + +impl NestedEncode for QueueMapperInfo {} + +impl NestedDecode for QueueMapperInfo {} impl EncodeDefault for QueueMapperInfo { fn is_default(&self) -> bool { @@ -63,34 +74,37 @@ impl QueueMapperInfo { /// /// The `QueueMapper` allows pushing and popping elements at either end /// in constant time. -pub struct QueueMapper +pub struct QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode + 'static, + A: StorageAddress, + T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, { _phantom_api: PhantomData, + address: A, base_key: StorageKey, _phantom_item: PhantomData, } -impl StorageMapper for QueueMapper +impl StorageMapper for QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode, + T: TopEncode + TopDecode + NestedEncode + NestedDecode, { fn new(base_key: StorageKey) -> Self { QueueMapper { _phantom_api: PhantomData, + address: StorageSCAddress, base_key, _phantom_item: PhantomData, } } } -impl StorageClearable for QueueMapper +impl StorageClearable for QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode, + T: TopEncode + TopDecode + NestedEncode + NestedDecode, { fn clear(&mut self) { let info = self.get_info(); @@ -105,10 +119,10 @@ where } } -impl QueueMapper +impl QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode, + T: TopEncode + TopDecode + NestedEncode + NestedDecode, { fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey { let mut named_key = self.base_key.clone(); @@ -124,16 +138,8 @@ where } fn get_info(&self) -> QueueMapperInfo { - storage_get(self.build_name_key(INFO_IDENTIFIER).as_ref()) - } - - fn get_info_at_address(&self, address: &ManagedAddress) -> QueueMapperInfo { - // storage_get_from_address::storage_get_from_address( - // address.as_ref(), - // self.build_name_key(INFO_IDENTIFIER).as_ref(), - // ) - let wrapper = StorageRawWrapper::new(); - wrapper.read_from_address(address, self.build_name_key(INFO_IDENTIFIER)) + self.address + .address_storage_get(self.build_name_key(INFO_IDENTIFIER).as_ref()) } fn set_info(&mut self, value: QueueMapperInfo) { @@ -141,7 +147,7 @@ where } fn get_node(&self, node_id: u32) -> Node { - storage_get( + self.address.address_storage_get( self.build_node_id_named_key(NODE_IDENTIFIER, node_id) .as_ref(), ) @@ -164,7 +170,7 @@ where } fn get_value(&self, node_id: u32) -> T { - storage_get( + self.address.address_storage_get( self.build_node_id_named_key(VALUE_IDENTIFIER, node_id) .as_ref(), ) @@ -200,10 +206,6 @@ where self.get_info().len == 0 } - pub fn is_empty_at_address(&self, address: &ManagedAddress) -> bool { - self.get_info_at_address(address).len == 0 - } - /// Returns the length of the `Queue`. /// /// This operation should compute in *O*(1) time. @@ -419,10 +421,166 @@ where } } -impl<'a, SA, T> IntoIterator for &'a QueueMapper +impl QueueMapper, T> +where + SA: StorageMapperApi, + T: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi, +{ + fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey { + let mut named_key = self.base_key.clone(); + named_key.append_bytes(name); + named_key.append_item(&node_id); + named_key + } + + fn build_name_key(&self, name: &[u8]) -> StorageKey { + let mut name_key = self.base_key.clone(); + name_key.append_bytes(name); + name_key + } + + pub fn new_from_address(address: ManagedAddress, base_key: StorageKey) -> Self { + QueueMapper { + _phantom_api: PhantomData::, + address, + base_key: base_key.clone(), + _phantom_item: PhantomData::, + } + } + + fn get_info(&self) -> QueueMapperInfo { + self.address + .address_storage_get(self.build_name_key(INFO_IDENTIFIER).as_ref()) + } + + fn get_node(&self, node_id: u32) -> Node { + self.address.address_storage_get( + self.build_node_id_named_key(NODE_IDENTIFIER, node_id) + .as_ref(), + ) + } + + fn get_value(&self, node_id: u32) -> T { + self.address.address_storage_get( + self.build_node_id_named_key(VALUE_IDENTIFIER, node_id) + .as_ref(), + ) + } + + fn get_value_option(&self, node_id: u32) -> Option { + if node_id == NULL_ENTRY { + return None; + } + Some(self.get_value(node_id)) + } + + /// Returns `true` if the `Queue` is empty. + /// + /// This operation should compute in *O*(1) time. + pub fn is_empty(&self) -> bool { + self.get_info().len == 0 + } + + /// Returns the length of the `Queue`. + /// + /// This operation should compute in *O*(1) time. + pub fn len(&self) -> usize { + self.get_info().len as usize + } + + /// Provides a copy to the front element, or `None` if the queue is + /// empty. + pub fn front(&self) -> Option { + self.get_value_option(self.get_info().front) + } + + /// Provides a copy to the back element, or `None` if the queue is + /// empty. + pub fn back(&self) -> Option { + self.get_value_option(self.get_info().back) + } + + // Provides a forward iterator. + // pub fn iter(&self) -> Iter { + // Iter::new(self) + // } + + /// Runs several checks in order to verify that both forwards and backwards iteration + /// yields the same node entries and that the number of items in the queue is correct. + /// Used for unit testing. + /// + /// This operation should compute in *O*(n) time. + pub fn check_internal_consistency(&self) -> bool { + let info = self.get_info(); + let mut front = info.front; + let mut back = info.back; + if info.len == 0 { + // if the queue is empty, both ends should point to null entries + if front != NULL_ENTRY { + return false; + } + if back != NULL_ENTRY { + return false; + } + true + } else { + // if the queue is non-empty, both ends should point to non-null entries + if front == NULL_ENTRY { + return false; + } + if back == NULL_ENTRY { + return false; + } + + // the node before the first and the one after the last should both be null + if self.get_node(front).previous != NULL_ENTRY { + return false; + } + if self.get_node(back).next != NULL_ENTRY { + return false; + } + + // iterate forwards + let mut forwards = Vec::new(); + while front != NULL_ENTRY { + forwards.push(front); + front = self.get_node(front).next; + } + if forwards.len() != info.len as usize { + return false; + } + + // iterate backwards + let mut backwards = Vec::new(); + while back != NULL_ENTRY { + backwards.push(back); + back = self.get_node(back).previous; + } + if backwards.len() != info.len as usize { + return false; + } + + // check that both iterations match element-wise + let backwards_reversed: Vec = backwards.iter().rev().cloned().collect(); + if forwards != backwards_reversed { + return false; + } + + // check that the node IDs are unique + forwards.sort_unstable(); + forwards.dedup(); + if forwards.len() != info.len as usize { + return false; + } + true + } + } +} + +impl<'a, SA, T> IntoIterator for &'a QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode + 'static, + T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, { type Item = T; @@ -440,18 +598,18 @@ where pub struct Iter<'a, SA, T> where SA: StorageMapperApi, - T: TopEncode + TopDecode + 'static, + T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, { node_id: u32, - queue: &'a QueueMapper, + queue: &'a QueueMapper, } impl<'a, SA, T> Iter<'a, SA, T> where SA: StorageMapperApi, - T: TopEncode + TopDecode + 'static, + T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, { - fn new(queue: &'a QueueMapper) -> Iter<'a, SA, T> { + fn new(queue: &'a QueueMapper) -> Iter<'a, SA, T> { Iter { node_id: queue.get_info().front, queue, @@ -462,7 +620,7 @@ where impl<'a, SA, T> Iterator for Iter<'a, SA, T> where SA: StorageMapperApi, - T: TopEncode + TopDecode + 'static, + T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, { type Item = T; @@ -478,10 +636,10 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TopEncodeMulti for QueueMapper +impl TopEncodeMulti for QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode, + T: TopEncode + TopDecode + NestedEncode + NestedDecode, { fn multi_encode_or_handle_err(&self, output: &mut O, h: H) -> Result<(), H::HandledErr> where @@ -492,18 +650,18 @@ where } } -impl CodecFrom> for MultiValueEncoded +impl CodecFrom> for MultiValueEncoded where SA: StorageMapperApi, - T: TopEncode + TopDecode, + T: TopEncode + TopDecode + NestedEncode + NestedDecode, { } /// Behaves like a MultiResultVec when an endpoint result. -impl TypeAbi for QueueMapper +impl TypeAbi for QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode + TypeAbi, + T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi, { fn type_name() -> TypeName { crate::abi::type_name_variadic::() diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs index 1408917253..5b82e60619 100644 --- a/framework/base/src/storage/mappers/set_mapper.rs +++ b/framework/base/src/storage/mappers/set_mapper.rs @@ -4,29 +4,59 @@ pub use super::queue_mapper::Iter; use super::{QueueMapper, StorageClearable, StorageMapper}; use crate::{ abi::{TypeAbi, TypeDescriptionContainer, TypeName}, - api::StorageMapperApi, + api::{ManagedTypeApi, StorageMapperApi}, codec::{ self, multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, NestedDecode, NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput, }, - storage::{storage_get, storage_set, StorageKey}, - types::{ManagedType, MultiValueEncoded, ManagedAddress}, + storage::{storage_get_from_address, storage_set, StorageKey}, + storage_get, + types::{ManagedAddress, ManagedRef, ManagedType, MultiValueEncoded, ManagedOption}, }; const NULL_ENTRY: u32 = 0; const NODE_ID_IDENTIFIER: &[u8] = b".node_id"; -pub struct SetMapper +pub trait StorageAddress +where + SA: StorageMapperApi , +{ + fn address_storage_get(&self, key: ManagedRef<'_, SA, StorageKey>) -> T; +} + +pub struct StorageSCAddress; + +impl StorageAddress for StorageSCAddress +where + SA: StorageMapperApi, +{ + fn address_storage_get(&self, key: ManagedRef<'_, SA, StorageKey>) -> T { + storage_get(key) + } +} + +impl StorageAddress for ManagedAddress where SA: StorageMapperApi, +{ + fn address_storage_get(&self, key: ManagedRef<'_, SA, StorageKey>) -> T { + storage_get_from_address(self.as_ref(), key) + } +} + +pub struct SetMapper +where + SA: StorageMapperApi, + A: StorageAddress, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, { _phantom_api: PhantomData, + address: A, base_key: StorageKey, - queue_mapper: QueueMapper, + queue_mapper: QueueMapper, } -impl StorageMapper for SetMapper +impl StorageMapper for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -34,13 +64,14 @@ where fn new(base_key: StorageKey) -> Self { SetMapper { _phantom_api: PhantomData, + address: StorageSCAddress, base_key: base_key.clone(), - queue_mapper: QueueMapper::::new(base_key), + queue_mapper: QueueMapper::new(base_key), } } } -impl StorageClearable for SetMapper +impl StorageClearable for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -53,25 +84,67 @@ where } } -impl SetMapper +impl SetMapper, T> where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode, + T: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi, { - fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey { + pub fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey { let mut named_key = self.base_key.clone(); named_key.append_bytes(name); named_key.append_item(value); named_key } + fn new_from_address(&self, address: ManagedAddress, base_key: StorageKey) -> Self { + SetMapper { + _phantom_api: PhantomData, + address, + base_key: base_key.clone(), + queue_mapper: QueueMapper::new_from_address(self.address.clone(), base_key), + } + } + fn get_node_id(&self, value: &T) -> u32 { - storage_get( + self.address.address_storage_get( self.build_named_value_key(NODE_ID_IDENTIFIER, value) .as_ref(), ) } + // Returns `true` if the set contains no elements. + pub fn is_empty(&self) -> bool { + self.queue_mapper.is_empty() + } + + // Returns the number of elements in the set. + pub fn len(&self) -> usize { + self.queue_mapper.len() + } + + // Returns `true` if the set contains a value. + pub fn contains(&self, value: &T) -> bool { + self.get_node_id(value) != NULL_ENTRY + } + + // Checks the internal consistency of the collection. Used for unit tests. + pub fn check_internal_consistency(&self) -> bool { + self.queue_mapper.check_internal_consistency() + } +} + +impl SetMapper +where + SA: StorageMapperApi, + T: TopEncode + TopDecode + NestedEncode + NestedDecode, +{ + pub fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey { + let mut named_key = self.base_key.clone(); + named_key.append_bytes(name); + named_key.append_item(value); + named_key + } + fn set_node_id(&self, value: &T, node_id: u32) { storage_set( self.build_named_value_key(NODE_ID_IDENTIFIER, value) @@ -88,25 +161,6 @@ where ); } - /// Returns `true` if the set contains no elements. - pub fn is_empty(&self) -> bool { - self.queue_mapper.is_empty() - } - - pub fn is_empty_at_address(&self, address: ManagedAddress) -> bool { - self.queue_mapper.is_empty_at_address(&address) - } - - /// Returns the number of elements in the set. - pub fn len(&self) -> usize { - self.queue_mapper.len() - } - - /// Returns `true` if the set contains a value. - pub fn contains(&self, value: &T) -> bool { - self.get_node_id(value) != NULL_ENTRY - } - /// Adds a value to the set. /// /// If the set did not have this value present, `true` is returned. @@ -148,13 +202,35 @@ where self.queue_mapper.iter() } - /// Checks the internal consistency of the collection. Used for unit tests. + fn get_node_id(&self, value: &T) -> u32 { + self.address.address_storage_get( + self.build_named_value_key(NODE_ID_IDENTIFIER, value) + .as_ref(), + ) + } + + // Returns `true` if the set contains no elements. + pub fn is_empty(&self) -> bool { + self.queue_mapper.is_empty() + } + + // Returns the number of elements in the set. + pub fn len(&self) -> usize { + self.queue_mapper.len() + } + + // Returns `true` if the set contains a value. + pub fn contains(&self, value: &T) -> bool { + self.get_node_id(value) != NULL_ENTRY + } + + // Checks the internal consistency of the collection. Used for unit tests. pub fn check_internal_consistency(&self) -> bool { self.queue_mapper.check_internal_consistency() } } -impl<'a, SA, T> IntoIterator for &'a SetMapper +impl<'a, SA, T> IntoIterator for &'a SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -168,7 +244,7 @@ where } } -impl Extend for SetMapper +impl Extend for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -184,7 +260,7 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TopEncodeMulti for SetMapper +impl TopEncodeMulti for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -198,7 +274,7 @@ where } } -impl CodecFrom> for MultiValueEncoded +impl CodecFrom> for MultiValueEncoded where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -206,7 +282,7 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TypeAbi for SetMapper +impl TypeAbi for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi, From c998343ebbf8cb2e72e180c512f39076097f2442 Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Thu, 11 Jan 2024 11:07:00 +0200 Subject: [PATCH 25/84] generic const impl --- .../src/storage_mapper_get_at_address.rs | 7 --- .../base/src/storage/mappers/map_mapper.rs | 54 +++++++++++-------- .../src/storage/mappers/map_storage_mapper.rs | 30 +++++------ .../base/src/storage/mappers/queue_mapper.rs | 29 +++++----- .../base/src/storage/mappers/set_mapper.rs | 36 ++++++------- 5 files changed, 78 insertions(+), 78 deletions(-) diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs index 873ccb3e4c..556f2d0abd 100644 --- a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs +++ b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs @@ -15,11 +15,4 @@ pub trait StorageMapperGetAtAddress { fn set_contract_address(&self, address: ManagedAddress) { self.contract_address().set(address) } - - #[endpoint] - fn is_empty_at_address(&self) -> bool { - let mapper = self.empty_set_mapper(); - let contract_address = self.contract_address().get(); - mapper.is_empty_at_address(contract_address) - } } diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs index 489ba09619..e04d204156 100644 --- a/framework/base/src/storage/mappers/map_mapper.rs +++ b/framework/base/src/storage/mappers/map_mapper.rs @@ -6,19 +6,19 @@ use super::{ }; use crate::{ abi::{TypeAbi, TypeDescriptionContainer, TypeName}, - api::{StorageMapperApi, ManagedTypeApi}, + api::StorageMapperApi, codec::{ multi_encode_iter_or_handle_err, multi_types::MultiValue2, CodecFrom, EncodeErrorHandler, NestedDecode, NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput, }, storage::{storage_clear, storage_get, storage_set, StorageKey}, - types::{ManagedType, MultiValueEncoded, ManagedAddress}, + types::{ManagedAddress, ManagedType, MultiValueEncoded}, }; const MAPPED_VALUE_IDENTIFIER: &[u8] = b".mapped"; type Keys<'a, SA, T> = set_mapper::Iter<'a, SA, T>; -pub struct MapMapper +pub struct MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -27,11 +27,11 @@ where { _phantom_api: PhantomData, base_key: StorageKey, - keys_set: SetMapper, + keys_set: SetMapper, _phantom_value: PhantomData, } -impl StorageMapper for MapMapper +impl StorageMapper for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -47,7 +47,7 @@ where } } -impl StorageClearable for MapMapper +impl StorageClearable for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -61,7 +61,7 @@ where } } -impl MapMapper +impl MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -166,10 +166,10 @@ where } } -impl MapMapper, K, V> +impl MapMapper> where SA: StorageMapperApi, - K: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode, V: TopEncode + TopDecode, { fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey { @@ -242,7 +242,7 @@ where // } } -impl<'a, SA, K, V> IntoIterator for &'a MapMapper +impl<'a, SA, K, V> IntoIterator for &'a MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -265,7 +265,7 @@ where V: TopEncode + TopDecode + 'static, { key_iter: Keys<'a, SA, K>, - hash_map: &'a MapMapper, + hash_map: &'a MapMapper, } impl<'a, SA, K, V> Iter<'a, SA, StorageSCAddress, K, V> @@ -274,7 +274,9 @@ where K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: TopEncode + TopDecode + 'static, { - fn new(hash_map: &'a MapMapper) -> Iter<'a, SA, StorageSCAddress, K, V> { + fn new( + hash_map: &'a MapMapper, + ) -> Iter<'a, SA, StorageSCAddress, K, V> { Iter { key_iter: hash_map.keys(), hash_map, @@ -308,7 +310,7 @@ where V: TopEncode + TopDecode + 'static, { key_iter: Keys<'a, SA, K>, - hash_map: &'a MapMapper, + hash_map: &'a MapMapper, } impl<'a, SA, K, V> Values<'a, SA, StorageSCAddress, K, V> @@ -317,7 +319,9 @@ where K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: TopEncode + TopDecode + 'static, { - fn new(hash_map: &'a MapMapper) -> Values<'a, SA, StorageSCAddress, K, V> { + fn new( + hash_map: &'a MapMapper, + ) -> Values<'a, SA, StorageSCAddress, K, V> { Values { key_iter: hash_map.keys(), hash_map, @@ -367,7 +371,7 @@ where V: TopEncode + TopDecode + 'static, { pub(super) key: K, - pub(super) map: &'a mut MapMapper, + pub(super) map: &'a mut MapMapper, // Be invariant in `K` and `V` pub(super) _marker: PhantomData<&'a mut (K, V)>, @@ -383,7 +387,7 @@ where V: TopEncode + TopDecode + 'static, { pub(super) key: K, - pub(super) map: &'a mut MapMapper, + pub(super) map: &'a mut MapMapper, // Be invariant in `K` and `V` pub(super) _marker: PhantomData<&'a mut (K, V)>, @@ -392,7 +396,7 @@ where impl<'a, SA, K, V> Entry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, - K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + ManagedTypeApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, V: TopEncode + TopDecode + 'static, { /// Ensures a value is in the entry by inserting the default if empty, and returns @@ -406,7 +410,10 @@ where /// Ensures a value is in the entry by inserting the result of the default function if empty, /// and returns an `OccupiedEntry`. - pub fn or_insert_with V>(self, default: F) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { + pub fn or_insert_with V>( + self, + default: F, + ) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert(default()), @@ -459,7 +466,7 @@ where impl<'a, SA, K, V: Default> Entry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, - K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + ManagedTypeApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, V: TopEncode + TopDecode + 'static, { /// Ensures a value is in the entry by inserting the default value if empty, @@ -475,7 +482,7 @@ where impl<'a, SA, K, V> VacantEntry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, - K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + ManagedTypeApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, V: TopEncode + TopDecode + 'static, { /// Gets a reference to the key that would be used when inserting a value @@ -541,7 +548,7 @@ where } /// Behaves like a MultiResultVec> when an endpoint result. -impl TopEncodeMulti for MapMapper +impl TopEncodeMulti for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -557,7 +564,8 @@ where } } -impl CodecFrom> for MultiValueEncoded> +impl CodecFrom> + for MultiValueEncoded> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -566,7 +574,7 @@ where } /// Behaves like a MultiResultVec> when an endpoint result. -impl TypeAbi for MapMapper +impl TypeAbi for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi + 'static, diff --git a/framework/base/src/storage/mappers/map_storage_mapper.rs b/framework/base/src/storage/mappers/map_storage_mapper.rs index 1aa36631b7..a844ac1906 100644 --- a/framework/base/src/storage/mappers/map_storage_mapper.rs +++ b/framework/base/src/storage/mappers/map_storage_mapper.rs @@ -5,7 +5,7 @@ use super::{ SetMapper, StorageClearable, StorageMapper, }; use crate::{ - api::{StorageMapperApi, ManagedTypeApi}, + api::StorageMapperApi, codec::{NestedDecode, NestedEncode, TopDecode, TopEncode}, storage::{self, StorageKey}, types::ManagedAddress, }; @@ -13,7 +13,7 @@ use crate::{ const MAPPED_STORAGE_VALUE_IDENTIFIER: &[u8] = b".storage"; type Keys<'a, SA, T> = set_mapper::Iter<'a, SA, T>; -pub struct MapStorageMapper +pub struct MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -22,11 +22,11 @@ where { _phantom_api: PhantomData, base_key: StorageKey, - keys_set: SetMapper, + keys_set: SetMapper, _phantom_value: PhantomData, } -impl StorageMapper for MapStorageMapper +impl StorageMapper for MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -42,7 +42,7 @@ where } } -impl StorageClearable for MapStorageMapper +impl StorageClearable for MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -56,7 +56,7 @@ where } } -impl MapStorageMapper +impl MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -155,10 +155,10 @@ where } } -impl MapStorageMapper, K, V> +impl MapStorageMapper> where SA: StorageMapperApi, - K: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode, V: StorageMapper + StorageClearable, { fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey { @@ -216,7 +216,7 @@ where } -impl<'a, SA, K, V> IntoIterator for &'a MapStorageMapper +impl<'a, SA, K, V> IntoIterator for &'a MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -239,7 +239,7 @@ where V: StorageMapper + StorageClearable, { key_iter: Keys<'a, SA, K>, - hash_map: &'a MapStorageMapper, + hash_map: &'a MapStorageMapper, } impl<'a, SA, K, V> Iter<'a, SA, StorageSCAddress, K, V> @@ -249,7 +249,7 @@ where V: StorageMapper + StorageClearable, { fn new( - hash_map: &'a MapStorageMapper, + hash_map: &'a MapStorageMapper, ) -> Iter<'a, SA, StorageSCAddress, K, V> { Iter { key_iter: hash_map.keys(), @@ -284,7 +284,7 @@ where V: StorageMapper + StorageClearable, { key_iter: Keys<'a, SA, K>, - hash_map: &'a MapStorageMapper, + hash_map: &'a MapStorageMapper, } impl<'a, SA, K, V> Values<'a, SA, StorageSCAddress, K, V> @@ -293,7 +293,7 @@ where K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: StorageMapper + StorageClearable, { - fn new(hash_map: &'a MapStorageMapper) -> Values<'a, SA, StorageSCAddress, K, V> { + fn new(hash_map: &'a MapStorageMapper) -> Values<'a, SA, StorageSCAddress, K, V> { Values { key_iter: hash_map.keys(), hash_map, @@ -343,7 +343,7 @@ where V: StorageMapper + StorageClearable, { pub(super) key: K, - pub(super) map: &'a mut MapStorageMapper, + pub(super) map: &'a mut MapStorageMapper, // Be invariant in `K` and `V` pub(super) _marker: PhantomData<&'a mut (K, V)>, @@ -359,7 +359,7 @@ where V: StorageMapper + StorageClearable, { pub(super) key: K, - pub(super) map: &'a mut MapStorageMapper, + pub(super) map: &'a mut MapStorageMapper, // Be invariant in `K` and `V` pub(super) _marker: PhantomData<&'a mut (K, V)>, diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs index e08bec2283..4899e9a10c 100644 --- a/framework/base/src/storage/mappers/queue_mapper.rs +++ b/framework/base/src/storage/mappers/queue_mapper.rs @@ -6,15 +6,14 @@ use super::{ }; use crate::{ abi::{TypeAbi, TypeDescriptionContainer, TypeName}, - api::{ManagedTypeApi, StorageMapperApi, StorageReadApi, StorageReadApiImpl}, + api::StorageMapperApi, codec::{ self, derive::{TopDecode, TopDecodeOrDefault, TopEncode, TopEncodeOrDefault}, multi_encode_iter_or_handle_err, CodecFrom, DecodeDefault, EncodeDefault, EncodeErrorHandler, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput, }, - contract_base::StorageRawWrapper, - storage::{storage_get, storage_get_from_address, storage_set, StorageKey}, + storage::{storage_set, StorageKey}, types::{ManagedAddress, ManagedType, MultiValueEncoded}, }; use alloc::vec::Vec; @@ -74,7 +73,7 @@ impl QueueMapperInfo { /// /// The `QueueMapper` allows pushing and popping elements at either end /// in constant time. -pub struct QueueMapper +pub struct QueueMapper where SA: StorageMapperApi, A: StorageAddress, @@ -86,7 +85,7 @@ where _phantom_item: PhantomData, } -impl StorageMapper for QueueMapper +impl StorageMapper for QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -101,7 +100,7 @@ where } } -impl StorageClearable for QueueMapper +impl StorageClearable for QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -119,7 +118,7 @@ where } } -impl QueueMapper +impl QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -421,10 +420,10 @@ where } } -impl QueueMapper, T> +impl QueueMapper> where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi, + T: TopEncode + TopDecode + NestedEncode + NestedDecode, { fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey { let mut named_key = self.base_key.clone(); @@ -577,7 +576,7 @@ where } } -impl<'a, SA, T> IntoIterator for &'a QueueMapper +impl<'a, SA, T> IntoIterator for &'a QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -601,7 +600,7 @@ where T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, { node_id: u32, - queue: &'a QueueMapper, + queue: &'a QueueMapper, } impl<'a, SA, T> Iter<'a, SA, T> @@ -609,7 +608,7 @@ where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, { - fn new(queue: &'a QueueMapper) -> Iter<'a, SA, T> { + fn new(queue: &'a QueueMapper) -> Iter<'a, SA, T> { Iter { node_id: queue.get_info().front, queue, @@ -636,7 +635,7 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TopEncodeMulti for QueueMapper +impl TopEncodeMulti for QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -650,7 +649,7 @@ where } } -impl CodecFrom> for MultiValueEncoded +impl CodecFrom> for MultiValueEncoded where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -658,7 +657,7 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TypeAbi for QueueMapper +impl TypeAbi for QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi, diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs index 5b82e60619..5ad57b5806 100644 --- a/framework/base/src/storage/mappers/set_mapper.rs +++ b/framework/base/src/storage/mappers/set_mapper.rs @@ -4,14 +4,14 @@ pub use super::queue_mapper::Iter; use super::{QueueMapper, StorageClearable, StorageMapper}; use crate::{ abi::{TypeAbi, TypeDescriptionContainer, TypeName}, - api::{ManagedTypeApi, StorageMapperApi}, + api::StorageMapperApi, codec::{ self, multi_encode_iter_or_handle_err, CodecFrom, EncodeErrorHandler, NestedDecode, NestedEncode, TopDecode, TopEncode, TopEncodeMulti, TopEncodeMultiOutput, }, storage::{storage_get_from_address, storage_set, StorageKey}, storage_get, - types::{ManagedAddress, ManagedRef, ManagedType, MultiValueEncoded, ManagedOption}, + types::{ManagedAddress, ManagedRef, ManagedType, MultiValueEncoded}, }; const NULL_ENTRY: u32 = 0; @@ -19,7 +19,7 @@ const NODE_ID_IDENTIFIER: &[u8] = b".node_id"; pub trait StorageAddress where - SA: StorageMapperApi , + SA: StorageMapperApi, { fn address_storage_get(&self, key: ManagedRef<'_, SA, StorageKey>) -> T; } @@ -44,7 +44,7 @@ where } } -pub struct SetMapper +pub struct SetMapper where SA: StorageMapperApi, A: StorageAddress, @@ -53,10 +53,10 @@ where _phantom_api: PhantomData, address: A, base_key: StorageKey, - queue_mapper: QueueMapper, + queue_mapper: QueueMapper, } -impl StorageMapper for SetMapper +impl StorageMapper for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -71,7 +71,7 @@ where } } -impl StorageClearable for SetMapper +impl StorageClearable for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -84,10 +84,10 @@ where } } -impl SetMapper, T> +impl SetMapper> where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode + ManagedTypeApi, + T: TopEncode + TopDecode + NestedEncode + NestedDecode, { pub fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey { let mut named_key = self.base_key.clone(); @@ -96,12 +96,12 @@ where named_key } - fn new_from_address(&self, address: ManagedAddress, base_key: StorageKey) -> Self { + pub fn new_from_address(address: ManagedAddress, base_key: StorageKey) -> Self { SetMapper { _phantom_api: PhantomData, - address, + address: address.clone(), base_key: base_key.clone(), - queue_mapper: QueueMapper::new_from_address(self.address.clone(), base_key), + queue_mapper: QueueMapper::new_from_address(address, base_key), } } @@ -133,7 +133,7 @@ where } } -impl SetMapper +impl SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -230,7 +230,7 @@ where } } -impl<'a, SA, T> IntoIterator for &'a SetMapper +impl<'a, SA, T> IntoIterator for &'a SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -244,7 +244,7 @@ where } } -impl Extend for SetMapper +impl Extend for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -260,7 +260,7 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TopEncodeMulti for SetMapper +impl TopEncodeMulti for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -274,7 +274,7 @@ where } } -impl CodecFrom> for MultiValueEncoded +impl CodecFrom> for MultiValueEncoded where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -282,7 +282,7 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TypeAbi for SetMapper +impl TypeAbi for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi, From 705a85b575483b36cfd66ce9ef8ee2f6f549ab9e Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Thu, 11 Jan 2024 15:43:40 +0200 Subject: [PATCH 26/84] added mandos tests --- .../storage_mapper_get_at_address.scen.json | 69 ++++++++++++++++++- .../src/storage_mapper_get_at_address.rs | 48 ++++++++++--- .../basic-features/wasm/src/lib.rs | 7 +- .../base/src/storage/mappers/set_mapper.rs | 8 +-- 4 files changed, 116 insertions(+), 16 deletions(-) diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json index 93755d995d..f9b4e026e7 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json @@ -100,7 +100,74 @@ "gasPrice": "0" }, "expect": { - "out": [""], + "out": [ + "" + ], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + }, + { + "step": "scCall", + "id": "contains at address", + "tx": { + "from": "address:an_account", + "to": "sc:basic-features", + "function": "contains_at_address", + "arguments": [ + "5" + ], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [ + "0x01" + ], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + }, + { + "step": "scCall", + "id": "len at address", + "tx": { + "from": "address:an_account", + "to": "sc:basic-features", + "function": "len_at_address", + "arguments": [], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [ + "10" + ], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + }, + { + "step": "scCall", + "id": "check internal consistency at address", + "tx": { + "from": "address:an_account", + "to": "sc:basic-features", + "function": "check_internal_consistency_at_address", + "arguments": [], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [ + "0x01" + ], "status": "", "logs": "*", "gas": "*", diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs index 556f2d0abd..2bf406e195 100644 --- a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs +++ b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs @@ -1,18 +1,48 @@ +use multiversx_sc::storage::StorageKey; + multiversx_sc::imports!(); multiversx_sc::derive_imports!(); /// Module that calls another contract to read the content of a SetMapper remotely #[multiversx_sc::module] pub trait StorageMapperGetAtAddress { - - #[storage_mapper("empty_set_mapper")] - fn empty_set_mapper(&self) -> SetMapper; + #[storage_mapper("contract_address")] + fn contract_address(&self) -> SingleValueMapper; + + #[endpoint] + fn set_contract_address(&self, address: ManagedAddress) { + self.contract_address().set(address) + } + + #[endpoint] + fn is_empty_at_address(&self) -> bool { + let address = self.contract_address().get(); + let mapper: SetMapper = + SetMapper::new_from_address(address, StorageKey::from("set_mapper")); + mapper.is_empty() + } + + #[endpoint] + fn contains_at_address(&self, item: u32) -> bool { + let address = self.contract_address().get(); + let mapper: SetMapper = + SetMapper::new_from_address(address, StorageKey::from("set_mapper")); + mapper.contains(&item) + } - #[storage_mapper("contract_address")] - fn contract_address(&self) -> SingleValueMapper; + #[endpoint] + fn len_at_address(&self) -> usize { + let address = self.contract_address().get(); + let mapper: SetMapper = + SetMapper::new_from_address(address, StorageKey::from("set_mapper")); + mapper.len() + } - #[endpoint] - fn set_contract_address(&self, address: ManagedAddress) { - self.contract_address().set(address) - } + #[endpoint] + fn check_internal_consistency_at_address(&self) -> bool { + let address = self.contract_address().get(); + let mapper: SetMapper = + SetMapper::new_from_address(address, StorageKey::from("set_mapper")); + mapper.check_internal_consistency() + } } diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs index 55372cba89..f7fbe79efd 100644 --- a/contracts/feature-tests/basic-features/wasm/src/lib.rs +++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs @@ -5,9 +5,9 @@ //////////////////////////////////////////////////// // Init: 1 -// Endpoints: 370 +// Endpoints: 373 // Async Callback: 1 -// Total number of exported functions: 372 +// Total number of exported functions: 375 #![no_std] #![allow(internal_features)] @@ -390,6 +390,9 @@ multiversx_sc_wasm_adapter::endpoints! { non_zero_usize_macro => non_zero_usize_macro set_contract_address => set_contract_address is_empty_at_address => is_empty_at_address + contains_at_address => contains_at_address + len_at_address => len_at_address + check_internal_consistency_at_address => check_internal_consistency_at_address ) } diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs index 5ad57b5806..70088a6779 100644 --- a/framework/base/src/storage/mappers/set_mapper.rs +++ b/framework/base/src/storage/mappers/set_mapper.rs @@ -112,22 +112,22 @@ where ) } - // Returns `true` if the set contains no elements. + /// Returns `true` if the set contains no elements. pub fn is_empty(&self) -> bool { self.queue_mapper.is_empty() } - // Returns the number of elements in the set. + /// Returns the number of elements in the set. pub fn len(&self) -> usize { self.queue_mapper.len() } - // Returns `true` if the set contains a value. + /// Returns `true` if the set contains a value. pub fn contains(&self, value: &T) -> bool { self.get_node_id(value) != NULL_ENTRY } - // Checks the internal consistency of the collection. Used for unit tests. + /// Checks the internal consistency of the collection. Used for unit tests. pub fn check_internal_consistency(&self) -> bool { self.queue_mapper.check_internal_consistency() } From 8903b00adc65a31d60954fdcd4ca218f166a0099 Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Fri, 12 Jan 2024 13:04:17 +0200 Subject: [PATCH 27/84] problem regarding temporary value --- framework/meta/src/cmd/standalone/info.rs | 2 +- .../standalone/template/contract_creator.rs | 17 +- .../src/cmd/standalone/template/copy_util.rs | 4 +- .../cmd/standalone/template/repo_version.rs | 8 +- .../standalone/template/template_adjuster.rs | 6 +- .../standalone/template/template_source.rs | 4 +- .../cmd/standalone/upgrade/upgrade_common.rs | 20 +-- .../cmd/standalone/upgrade/upgrade_print.rs | 25 ++- .../standalone/upgrade/upgrade_selector.rs | 57 ++++--- .../folder_structure/relevant_directory.rs | 20 +-- .../meta/src/folder_structure/version_req.rs | 13 +- framework/meta/src/version.rs | 8 +- framework/meta/src/version_history.rs | 160 +++++++++--------- 13 files changed, 174 insertions(+), 170 deletions(-) diff --git a/framework/meta/src/cmd/standalone/info.rs b/framework/meta/src/cmd/standalone/info.rs index c086a54de5..07df89b2d0 100644 --- a/framework/meta/src/cmd/standalone/info.rs +++ b/framework/meta/src/cmd/standalone/info.rs @@ -14,6 +14,6 @@ pub fn call_info(args: &InfoArgs) { let dirs = RelevantDirectories::find_all(path, args.ignore.as_slice()); dir_pretty_print(dirs.iter(), "", &|dir| { - print_tree_dir_metadata(dir, LAST_UPGRADE_VERSION) + print_tree_dir_metadata(dir, &LAST_UPGRADE_VERSION) }); } diff --git a/framework/meta/src/cmd/standalone/template/contract_creator.rs b/framework/meta/src/cmd/standalone/template/contract_creator.rs index 83fcfcc103..2e8c83ff45 100644 --- a/framework/meta/src/cmd/standalone/template/contract_creator.rs +++ b/framework/meta/src/cmd/standalone/template/contract_creator.rs @@ -11,7 +11,7 @@ use super::{ /// Creates a new contract on disk, from a template, given a name. pub fn create_contract(args: &TemplateArgs) { let version = get_repo_version(&args.tag); - let version_tag: String = version.get_tag(); + let version_tag: FrameworkVersion = version.get_tag(); let repo_temp_download = RepoSource::download_from_github(version, std::env::temp_dir()); let target = target_from_args(args); @@ -31,11 +31,10 @@ fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget { pub(crate) fn get_repo_version(args_tag: &Option) -> RepoVersion { if let Some(tag) = args_tag { - let tag_version: FrameworkVersion = FrameworkVersion::from_string_template(tag); - assert!(validate_template_tag(tag_version), "invalid template tag"); + assert!(validate_template_tag(tag), "invalid template tag"); RepoVersion::Tag(tag.clone()) } else { - RepoVersion::Tag(LAST_TEMPLATE_VERSION.to_string()) + RepoVersion::Tag(LAST_TEMPLATE_VERSION.version.to_string()) } } @@ -73,18 +72,18 @@ impl<'a> ContractCreator<'a> { } } - pub fn create_contract(&self, args_tag: String) { - self.copy_template(&args_tag); - self.update_dependencies(&args_tag); + pub fn create_contract(&self, args_tag: FrameworkVersion) { + self.copy_template(args_tag.clone()); + self.update_dependencies(args_tag); self.rename_template(); } - pub fn copy_template(&self, args_tag: &str) { + pub fn copy_template(&self, args_tag: FrameworkVersion) { self.template_source .copy_template(self.target.contract_dir(), args_tag); } - pub fn update_dependencies(&self, args_tag: &str) { + pub fn update_dependencies(&self, args_tag: FrameworkVersion) { self.adjuster.update_dependencies(args_tag); } diff --git a/framework/meta/src/cmd/standalone/template/copy_util.rs b/framework/meta/src/cmd/standalone/template/copy_util.rs index f49911b6f1..e9ffdbe497 100644 --- a/framework/meta/src/cmd/standalone/template/copy_util.rs +++ b/framework/meta/src/cmd/standalone/template/copy_util.rs @@ -3,7 +3,7 @@ use std::{ path::{Path, PathBuf}, }; -use crate::version_history::is_template_with_autogenerated_json; +use crate::{version_history::is_template_with_autogenerated_json, version::FrameworkVersion}; /// Will copy an entire folder according to a whitelist of allowed paths. /// @@ -16,7 +16,7 @@ pub fn whitelisted_deep_copy( source_root: &Path, target_root: &Path, whitelist: &[String], - args_tag: &str, + args_tag: FrameworkVersion, ) { if is_template_with_autogenerated_json(args_tag) { perform_file_copy(source_root, &PathBuf::new(), target_root, whitelist); diff --git a/framework/meta/src/cmd/standalone/template/repo_version.rs b/framework/meta/src/cmd/standalone/template/repo_version.rs index 150c2bebc3..874f1b3832 100644 --- a/framework/meta/src/cmd/standalone/template/repo_version.rs +++ b/framework/meta/src/cmd/standalone/template/repo_version.rs @@ -1,4 +1,4 @@ -use crate::version_history::LAST_TEMPLATE_VERSION; +use crate::{version::FrameworkVersion, version_history::LAST_TEMPLATE_VERSION}; pub enum RepoVersion { Master, @@ -26,10 +26,10 @@ impl RepoVersion { } } - pub fn get_tag(&self) -> String { + pub fn get_tag(&self) -> FrameworkVersion { match self { - RepoVersion::Master => LAST_TEMPLATE_VERSION.to_string(), - RepoVersion::Tag(tag) => tag.to_string(), + RepoVersion::Master => LAST_TEMPLATE_VERSION, + RepoVersion::Tag(tag) => FrameworkVersion::from_string_template(tag), } } } diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs index afaa20aebf..2f08eb8c53 100644 --- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs +++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs @@ -2,7 +2,7 @@ use super::{template_metadata::TemplateMetadata, ContractCreatorTarget}; use crate::{ cmd::standalone::upgrade::upgrade_common::{rename_files, replace_in_files}, version_history::is_template_with_autogenerated_wasm, - CargoTomlContents, + CargoTomlContents, version::FrameworkVersion, }; use convert_case::{Case, Casing}; use ruplacer::Query; @@ -19,7 +19,7 @@ pub struct TemplateAdjuster { pub keep_paths: bool, } impl TemplateAdjuster { - pub fn update_dependencies(&self, args_tag: &str) { + pub fn update_dependencies(&self, args_tag: FrameworkVersion) { self.update_dependencies_root(); self.update_dependencies_meta(); self.update_dependencies_wasm(args_tag); @@ -49,7 +49,7 @@ impl TemplateAdjuster { toml.save_to_file(&cargo_toml_path); } - fn update_dependencies_wasm(&self, args_tag: &str) { + fn update_dependencies_wasm(&self, args_tag: FrameworkVersion) { if is_template_with_autogenerated_wasm(args_tag) { return; } diff --git a/framework/meta/src/cmd/standalone/template/template_source.rs b/framework/meta/src/cmd/standalone/template/template_source.rs index eb71ec31eb..ea4140cd31 100644 --- a/framework/meta/src/cmd/standalone/template/template_source.rs +++ b/framework/meta/src/cmd/standalone/template/template_source.rs @@ -3,7 +3,7 @@ use std::{ path::{Path, PathBuf}, }; -use crate::folder_structure::RelevantDirectories; +use crate::{folder_structure::RelevantDirectories, version::FrameworkVersion}; use super::{copy_util::whitelisted_deep_copy, template_metadata::TemplateMetadata, RepoSource}; @@ -17,7 +17,7 @@ pub struct TemplateSource<'a> { } impl<'a> TemplateSource<'a> { - pub fn copy_template(&self, target_path: impl AsRef, args_tag: &str) { + pub fn copy_template(&self, target_path: impl AsRef, args_tag: FrameworkVersion) { whitelisted_deep_copy( &self.source_path, target_path.as_ref(), diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs index 757c7b23d2..91fef89c69 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs @@ -12,7 +12,7 @@ use crate::{ folder_structure::{ DirectoryType, RelevantDirectory, VersionReq, CARGO_TOML_FILE_NAME, FRAMEWORK_CRATE_NAMES, }, - CargoTomlContents, + CargoTomlContents, version::FrameworkVersion, }; use super::{upgrade_print::*, upgrade_settings::UpgradeSettings}; @@ -75,7 +75,7 @@ fn try_replace_file_name(file_name_str: &str, patterns: &[(&str, &str)]) -> Opti } /// Uses `CargoTomlContents`. Will only replace versions of framework crates. -pub fn version_bump_in_cargo_toml(path: &Path, from_version: &str, to_version: &str) { +pub fn version_bump_in_cargo_toml(path: &Path, from_version: &FrameworkVersion, to_version: &FrameworkVersion) { if is_cargo_toml_file(path) { let mut cargo_toml_contents = CargoTomlContents::load_from_file(path); upgrade_all_dependency_versions( @@ -114,8 +114,8 @@ fn is_cargo_toml_file(path: &Path) -> bool { fn upgrade_all_dependency_versions( cargo_toml_contents: &mut CargoTomlContents, deps_name: &str, - from_version: &str, - to_version: &str, + from_version: &FrameworkVersion, + to_version: &FrameworkVersion, ) { if let Some(dependencies) = cargo_toml_contents.toml_value.get_mut(deps_name) { for &framework_crate_name in FRAMEWORK_CRATE_NAMES { @@ -136,8 +136,8 @@ fn upgrade_dependency_version( deps_name: &str, dependencies: &mut Value, framework_crate_name: &str, - from_version: &str, - to_version: &str, + from_version: &FrameworkVersion, + to_version: &FrameworkVersion, ) { match dependencies.get_mut(framework_crate_name) { Some(Value::String(version_string)) => { @@ -168,16 +168,16 @@ fn upgrade_dependency_version( fn change_version_string( version_string: &mut String, - from_version: &str, - to_version: &str, + from_version: &FrameworkVersion, + to_version: &FrameworkVersion, path: &Path, deps_name: &str, framework_crate_name: &str, ) { let version_string_before = version_string.clone(); let mut version_spec = VersionReq::from_string(std::mem::take(version_string)); - if version_spec.semver == from_version { - version_spec.semver = to_version.to_string(); + if version_spec.semver == *from_version { + version_spec.semver = to_version.clone(); } *version_string = version_spec.into_string(); diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs index 6ef50b6dea..b3df63aa30 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs @@ -1,6 +1,9 @@ -use crate::folder_structure::{ - DirectoryType::{Contract, Lib}, - RelevantDirectory, +use crate::{ + folder_structure::{ + DirectoryType::{Contract, Lib}, + RelevantDirectory, + }, + version::FrameworkVersion, }; use colored::Colorize; use std::path::Path; @@ -10,7 +13,9 @@ pub fn print_upgrading(dir: &RelevantDirectory) { println!( "\n{}", format!( - "Upgrading from {from_version} to {to_version} in {}\n", + "Upgrading from {} to {} in {}\n", + from_version.version.to_string(), + to_version.version.to_string(), dir.path.display(), ) .purple() @@ -23,7 +28,9 @@ pub fn print_post_processing(dir: &RelevantDirectory) { println!( "\n{}", format!( - "Post-processing after upgrade from {from_version} to {to_version} in {}\n", + "Post-processing after upgrade from {} to {} in {}\n", + from_version.version.to_string(), + to_version.version.to_string(), dir.path.display(), ) .purple() @@ -71,14 +78,14 @@ pub fn print_postprocessing_after_39_1(path: &Path) { ); } -pub fn print_tree_dir_metadata(dir: &RelevantDirectory, last_version: &str) { +pub fn print_tree_dir_metadata(dir: &RelevantDirectory, last_version: &FrameworkVersion) { match dir.dir_type { Contract => print!(" {}", "[contract]".blue()), Lib => print!(" {}", "[lib]".magenta()), } - let version_string = format!("[{}]", &dir.version.semver); - if dir.version.semver == last_version { + let version_string = format!("[{}]", dir.version.semver.version.to_string().as_str()); + if dir.version.semver == *last_version { print!(" {}", version_string.green()); } else { print!(" {}", version_string.red()); @@ -106,7 +113,7 @@ pub fn print_cargo_check(dir: &RelevantDirectory) { "\n{}", format!( "Running cargo check after upgrading to version {} in {}\n", - dir.version.semver, + dir.version.semver.version.to_string(), dir.path.display(), ) .purple() diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs index 17114bdb49..658396077e 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs @@ -2,7 +2,7 @@ use crate::{ cli_args::UpgradeArgs, cmd::standalone::upgrade::upgrade_settings::UpgradeSettings, folder_structure::{dir_pretty_print, RelevantDirectories, RelevantDirectory}, - version_history::{versions_iter, LAST_UPGRADE_VERSION, VERSIONS}, + version_history::{versions_iter, LAST_UPGRADE_VERSION, MILESTONE_VERSION, VERSIONS}, }; use super::{ @@ -26,11 +26,18 @@ pub fn upgrade_sc(args: &UpgradeArgs) { let last_version = args .override_target_version .clone() - .unwrap_or_else(|| LAST_UPGRADE_VERSION.to_string()); + .map(|override_target_v| { + VERSIONS + .iter() + .find(|&v| v.version.to_string() == override_target_v) + .unwrap_or_else(|| &LAST_UPGRADE_VERSION) + }) + .unwrap_or_else(|| &LAST_UPGRADE_VERSION); assert!( - VERSIONS.contains(&last_version.as_str()), - "Invalid requested version: {last_version}", + VERSIONS.contains(&last_version), + "Invalid requested version: {}", + last_version.version.to_string(), ); let mut dirs = RelevantDirectories::find_all(path, args.ignore.as_slice()); @@ -40,15 +47,18 @@ pub fn upgrade_sc(args: &UpgradeArgs) { dirs.iter_contract_crates().count(), ); dir_pretty_print(dirs.iter(), "", &|dir| { - print_tree_dir_metadata(dir, last_version.as_str()) + print_tree_dir_metadata(dir, last_version) }); - for (from_version, to_version) in versions_iter(last_version) { + for (from_version, to_version) in versions_iter(last_version.clone()) { if dirs.count_for_version(from_version) == 0 { continue; } - print_upgrading_all(from_version, to_version); + print_upgrading_all( + from_version.version.to_string().as_str(), + &to_version.version.to_string().as_str(), + ); dirs.start_upgrade(from_version, to_version); for dir in dirs.iter_version(from_version) { upgrade_function_selector(dir); @@ -70,20 +80,12 @@ fn upgrade_function_selector(dir: &RelevantDirectory) { } match dir.upgrade_in_progress { - Some((_, "0.31.0")) => { - upgrade_to_31_0(dir); - }, - Some((_, "0.32.0")) => { - upgrade_to_32_0(dir); - }, - Some((_, "0.39.0")) => { - upgrade_to_39_0(dir); - }, - Some((_, "0.45.0")) => { - upgrade_to_45_0(dir); - }, - Some((from_version, to_version)) => { - version_bump_in_cargo_toml(&dir.path, from_version, to_version); + Some((from_version, to_version)) => match to_version.version.to_string().as_str() { + "0.31.0" => upgrade_to_31_0(dir), + "0.32.0" => upgrade_to_32_0(dir), + "0.39.0" => upgrade_to_39_0(dir), + "0.45.0" => upgrade_to_45_0(dir), + _ => version_bump_in_cargo_toml(&dir.path, from_version, to_version), }, None => {}, } @@ -91,14 +93,17 @@ fn upgrade_function_selector(dir: &RelevantDirectory) { fn upgrade_post_processing(dir: &RelevantDirectory, settings: &UpgradeSettings) { match dir.upgrade_in_progress { - Some((_, "0.28.0")) | Some((_, "0.29.0")) | Some((_, "0.30.0")) | Some((_, "0.31.0")) - | Some((_, "0.32.0")) | Some((_, "0.33.0")) | Some((_, "0.34.0")) | Some((_, "0.35.0")) - | Some((_, "0.36.0")) | Some((_, "0.37.0")) | Some((_, "0.40.0")) | Some((_, "0.41.0")) - | Some((_, "0.42.0")) | Some((_, "0.43.0")) | Some((_, "0.44.0")) | Some((_, "0.45.2")) => { + Some((_, to_version)) + if [ + "0.28.0", "0.29.0", "0.30.0", "0.31.0", "0.32.0", "0.33.0", "0.34.0", "0.35.0", + "0.36.0", "0.37.0", "0.40.0", "0.41.0", "0.42.0", "0.43.0", "0.44.0", "0.45.2", + ] + .contains(&to_version.version.to_string().as_str()) => + { print_post_processing(dir); cargo_check(dir, settings); }, - Some((_, "0.39.0")) => { + Some((_, MILESTONE_VERSION)) => { print_post_processing(dir); postprocessing_after_39_0(dir); cargo_check(dir, settings); diff --git a/framework/meta/src/folder_structure/relevant_directory.rs b/framework/meta/src/folder_structure/relevant_directory.rs index fc380a0014..fab3f30d3a 100644 --- a/framework/meta/src/folder_structure/relevant_directory.rs +++ b/framework/meta/src/folder_structure/relevant_directory.rs @@ -1,4 +1,4 @@ -use crate::CargoTomlContents; +use crate::{CargoTomlContents, version::FrameworkVersion}; use std::{ fs::{self, DirEntry}, path::{Path, PathBuf}, @@ -33,7 +33,7 @@ pub enum DirectoryType { pub struct RelevantDirectory { pub path: PathBuf, pub version: VersionReq, - pub upgrade_in_progress: Option<(&'static str, &'static str)>, + pub upgrade_in_progress: Option<(&'static FrameworkVersion, &'static FrameworkVersion)>, pub dir_type: DirectoryType, } @@ -83,26 +83,26 @@ impl RelevantDirectories { .filter(|dir| dir.dir_type == DirectoryType::Contract) } - pub fn count_for_version(&self, version: &str) -> usize { + pub fn count_for_version(&self, version: &FrameworkVersion) -> usize { self.0 .iter() - .filter(|dir| dir.version.semver == version) + .filter(|dir| dir.version.semver == *version) .count() } pub fn iter_version( &mut self, - version: &'static str, + version: &'static FrameworkVersion, ) -> impl Iterator { self.0 .iter() - .filter(move |dir| dir.version.semver == version) + .filter(move |dir| dir.version.semver == *version) } /// Marks all appropriate directories as ready for upgrade. - pub fn start_upgrade(&mut self, from_version: &'static str, to_version: &'static str) { + pub fn start_upgrade(&mut self, from_version: &'static FrameworkVersion, to_version: &'static FrameworkVersion) { for dir in self.0.iter_mut() { - if dir.version.semver == from_version { + if dir.version.semver == *from_version { dir.upgrade_in_progress = Some((from_version, to_version)); } } @@ -112,8 +112,8 @@ impl RelevantDirectories { /// and resets upgrade status. pub fn finish_upgrade(&mut self) { for dir in self.0.iter_mut() { - if let Some((_, to_version)) = &dir.upgrade_in_progress { - dir.version.semver = to_version.to_string(); + if let Some((_, to_version)) = dir.upgrade_in_progress { + dir.version.semver = to_version.clone(); dir.upgrade_in_progress = None; } } diff --git a/framework/meta/src/folder_structure/version_req.rs b/framework/meta/src/folder_structure/version_req.rs index 8bc71ebd77..98d39d45b7 100644 --- a/framework/meta/src/folder_structure/version_req.rs +++ b/framework/meta/src/folder_structure/version_req.rs @@ -1,22 +1,23 @@ +use crate::{version::FrameworkVersion, version_history::{find_version_str, LAST_VERSION}}; + /// Crate version requirements, as expressed in Cargo.toml. A very crude version. /// /// TODO: replace with semver::VersionReq at some point. #[derive(Debug, Clone)] pub struct VersionReq { - pub semver: String, + pub semver: FrameworkVersion, pub is_strict: bool, } - impl VersionReq { pub fn from_string(raw: String) -> Self { if let Some(stripped_version) = raw.strip_prefix('=') { VersionReq { - semver: stripped_version.to_string(), + semver: find_version_str(stripped_version).unwrap_or(&LAST_VERSION).clone(), is_strict: true, } } else { VersionReq { - semver: raw, + semver: find_version_str(&raw).unwrap_or(&LAST_VERSION).clone(), is_strict: false, } } @@ -24,9 +25,9 @@ impl VersionReq { pub fn into_string(self) -> String { if self.is_strict { - format!("={}", self.semver) + format!("={}", self.semver.version.to_string()) } else { - self.semver + self.semver.version.to_string() } } } diff --git a/framework/meta/src/version.rs b/framework/meta/src/version.rs index 3843384a4d..b927edff58 100644 --- a/framework/meta/src/version.rs +++ b/framework/meta/src/version.rs @@ -27,10 +27,10 @@ impl FrameworkVersion { pub fn from_string_template(version_str: &str) -> Self { let version_arr: Vec<&str> = version_str.split('.').collect(); - let major: u64= version_arr[0].parse().unwrap(); - let minor: u64= version_arr[0].parse().unwrap(); - let patch: u64= version_arr[0].parse().unwrap(); - + let major: u64 = version_arr[0].parse().unwrap(); + let minor: u64 = version_arr[0].parse().unwrap(); + let patch: u64 = version_arr[0].parse().unwrap(); + FrameworkVersion::new(major, minor, patch) } } diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index d076633b5d..8b73569098 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -3,119 +3,108 @@ use crate::{framework_version, framework_versions, version::FrameworkVersion}; /// The last version to be used for upgrades and templates. /// /// Should be edited every time a new version of the framework is released. -pub const LAST_VERSION: &str = "0.45.2"; +pub const LAST_VERSION: FrameworkVersion = framework_version!(0.45.2); /// Indicates where to stop with the upgrades. -pub const LAST_UPGRADE_VERSION: &str = LAST_VERSION; +pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION; -pub const LAST_TEMPLATE_VERSION: &str = LAST_VERSION; +pub const LAST_TEMPLATE_VERSION: FrameworkVersion = framework_version!(0.45.2); -/// Known versions for the upgrader. #[rustfmt::skip] -pub const VERSIONS: &[&str] = &[ - "0.28.0", - "0.29.0", - "0.29.2", - "0.29.3", - "0.30.0", - "0.31.0", - "0.31.1", - "0.32.0", - "0.33.0", - "0.33.1", - "0.34.0", - "0.34.1", - "0.35.0", - "0.36.0", - "0.36.1", - "0.37.0", - "0.38.0", - "0.39.0", - "0.39.1", - "0.39.2", - "0.39.3", - "0.39.4", - "0.39.5", - "0.39.6", - "0.39.7", - "0.39.8", - "0.40.0", - "0.40.1", - "0.41.0", - "0.41.1", - "0.41.2", - "0.41.3", - "0.42.0", - "0.43.0", - "0.43.1", - "0.43.2", - "0.43.3", - "0.43.4", - "0.43.5", - "0.44.0", - "0.45.0", - "0.45.2", -]; - -const ALL_VERSIONS: &[FrameworkVersion] = framework_versions![ - 0.28.0, 0.29.0, 0.29.2, 0.29.3, 0.30.0, 0.31.0, 0.31.1, 0.32.0, 0.33.0, 0.33.1, 0.34.0, 0.34.1, - 0.35.0, 0.36.0, 0.36.1, 0.37.0, 0.38.0, 0.39.0, 0.39.1, 0.39.2, 0.39.3, 0.39.4, 0.39.5, 0.39.6, - 0.39.7, 0.39.8, 0.40.0, 0.40.1, 0.41.0, 0.41.1, 0.41.2, 0.41.3, 0.42.0, 0.43.0, 0.43.1, 0.43.2, - 0.43.3, 0.43.4, 0.43.5, 0.44.0, 0.45.0, 0.45.2 +/// Known versions for the upgrader. +pub const VERSIONS: &[FrameworkVersion] = framework_versions![ + 0.28.0, + 0.29.0, + 0.29.2, + 0.29.3, + 0.30.0, + 0.31.0, + 0.31.1, + 0.32.0, + 0.33.0, + 0.33.1, + 0.34.0, + 0.34.1, + 0.35.0, + 0.36.0, + 0.36.1, + 0.37.0, + 0.38.0, + 0.39.0, + 0.39.1, + 0.39.2, + 0.39.3, + 0.39.4, + 0.39.5, + 0.39.6, + 0.39.7, + 0.39.8, + 0.40.0, + 0.40.1, + 0.41.0, + 0.41.1, + 0.41.2, + 0.41.3, + 0.42.0, + 0.43.0, + 0.43.1, + 0.43.2, + 0.43.3, + 0.43.4, + 0.43.5, + 0.44.0, + 0.45.0, + 0.45.2 ]; -pub const LAST_TEMPLATE_VERSION_FV: FrameworkVersion = framework_version!(0.45.2); - -pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0); +pub const LOWER_VERSION_WITH_TEMPLATE_TAG: &FrameworkVersion = &VERSIONS[30]; +pub const TEMPLATE_VERSIONS_WITH_AUTOGENERATED_WASM: &FrameworkVersion = &VERSIONS[40]; +pub const TEMPLATE_VERSIONS_WITH_AUTOGENERATED_JSON: &FrameworkVersion = &VERSIONS[39]; +pub const MILESTONE_VERSION: &FrameworkVersion = &VERSIONS[17]; /// We started supporting contract templates with version 0.43.0. -pub fn validate_template_tag(tag: FrameworkVersion) -> bool { - tag >= LOWER_VERSION_WITH_TEMPLATE_TAG && tag <= LAST_TEMPLATE_VERSION_FV - // template_versions().iter().any(|&tt| tt == tag) -} +pub fn validate_template_tag(tag_str: &str) -> bool { + let tag: FrameworkVersion = FrameworkVersion::from_string_template(tag_str); -pub fn template_versions_with_autogenerated_wasm() -> &'static [&'static str] { - &VERSIONS[40..] + tag >= *LOWER_VERSION_WITH_TEMPLATE_TAG && tag <= LAST_VERSION } -pub fn is_template_with_autogenerated_wasm(tag: &str) -> bool { - template_versions_with_autogenerated_wasm() - .iter() - .any(|&tt| tt == tag) +pub fn is_template_with_autogenerated_wasm(tag: FrameworkVersion) -> bool { + tag >= *TEMPLATE_VERSIONS_WITH_AUTOGENERATED_WASM } -pub fn template_versions_with_autogenerated_json() -> &'static [&'static str] { - &VERSIONS[39..] +pub fn is_template_with_autogenerated_json(tag: FrameworkVersion) -> bool { + tag >= *TEMPLATE_VERSIONS_WITH_AUTOGENERATED_JSON } -pub fn is_template_with_autogenerated_json(tag: &str) -> bool { - template_versions_with_autogenerated_json() +pub fn find_version_str(tag: &str) -> Option<&FrameworkVersion> { + VERSIONS .iter() - .any(|&tt| tt == tag) + .find(|&v| v.version.to_string() == tag) } pub struct VersionIterator { next_version: usize, - last_version: String, + last_version: FrameworkVersion, } impl VersionIterator { - fn is_last_version(&self, version: &str) -> bool { - self.last_version == version + fn is_last_version(&self, version: &FrameworkVersion) -> bool { + self.last_version == *version } } impl Iterator for VersionIterator { - type Item = (&'static str, &'static str); + type Item = (&'static FrameworkVersion, &'static FrameworkVersion); fn next(&mut self) -> Option { if self.next_version > 0 && self.next_version < VERSIONS.len() { - let from_version = VERSIONS[self.next_version - 1]; + let from_version = &VERSIONS[self.next_version - 1]; - if self.is_last_version(from_version) { + if self.is_last_version(&from_version) { None } else { - let to_version = VERSIONS[self.next_version]; + let to_version = &VERSIONS[self.next_version]; let result = (from_version, to_version); self.next_version += 1; Some(result) @@ -126,7 +115,7 @@ impl Iterator for VersionIterator { } } -pub fn versions_iter(last_version: String) -> VersionIterator { +pub fn versions_iter(last_version: FrameworkVersion) -> VersionIterator { VersionIterator { next_version: 1, last_version, @@ -142,11 +131,14 @@ pub mod tests { #[test] fn template_versions_test() { - // assert_eq!(template_versions()[0], "0.43.0"); + assert!(validate_template_tag(framework_version!(0.43.0))); + assert!(!validate_template_tag(framework_version!(0.42.0))); + assert!(!validate_template_tag(framework_version!(0.47.0))); + } - assert!(validate_template_tag(FrameworkVersion::new(0, 43, 0))); - assert!(!validate_template_tag(FrameworkVersion::new(0, 42, 0))); - assert!(!validate_template_tag(FrameworkVersion::new(0, 47, 0))); + #[test] + fn check_string_eq() { + assert_eq!(VERSIONS[0].version.to_string(), "0.28.0") } #[test] From a38f35abd1913f8cecaf8ac4a57008acb79bfe06 Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Mon, 15 Jan 2024 10:18:33 +0200 Subject: [PATCH 28/84] done refactoring --- .../standalone/upgrade/upgrade_selector.rs | 31 +++++++-------- framework/meta/src/version_history.rs | 38 +++++++++---------- framework/meta/tests/template_test.rs | 6 +-- 3 files changed, 38 insertions(+), 37 deletions(-) diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs index 658396077e..88702ca845 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs @@ -2,7 +2,7 @@ use crate::{ cli_args::UpgradeArgs, cmd::standalone::upgrade::upgrade_settings::UpgradeSettings, folder_structure::{dir_pretty_print, RelevantDirectories, RelevantDirectory}, - version_history::{versions_iter, LAST_UPGRADE_VERSION, MILESTONE_VERSION, VERSIONS}, + version_history::{versions_iter, LAST_UPGRADE_VERSION, VERSIONS}, }; use super::{ @@ -29,10 +29,11 @@ pub fn upgrade_sc(args: &UpgradeArgs) { .map(|override_target_v| { VERSIONS .iter() - .find(|&v| v.version.to_string() == override_target_v) - .unwrap_or_else(|| &LAST_UPGRADE_VERSION) + .find(|v| v.version.to_string() == override_target_v) + .cloned() + .unwrap_or_else(|| LAST_UPGRADE_VERSION) }) - .unwrap_or_else(|| &LAST_UPGRADE_VERSION); + .unwrap_or_else(|| LAST_UPGRADE_VERSION); assert!( VERSIONS.contains(&last_version), @@ -47,7 +48,7 @@ pub fn upgrade_sc(args: &UpgradeArgs) { dirs.iter_contract_crates().count(), ); dir_pretty_print(dirs.iter(), "", &|dir| { - print_tree_dir_metadata(dir, last_version) + print_tree_dir_metadata(dir, &last_version) }); for (from_version, to_version) in versions_iter(last_version.clone()) { @@ -93,20 +94,20 @@ fn upgrade_function_selector(dir: &RelevantDirectory) { fn upgrade_post_processing(dir: &RelevantDirectory, settings: &UpgradeSettings) { match dir.upgrade_in_progress { - Some((_, to_version)) + Some((_, to_version)) => { if [ "0.28.0", "0.29.0", "0.30.0", "0.31.0", "0.32.0", "0.33.0", "0.34.0", "0.35.0", "0.36.0", "0.37.0", "0.40.0", "0.41.0", "0.42.0", "0.43.0", "0.44.0", "0.45.2", ] - .contains(&to_version.version.to_string().as_str()) => - { - print_post_processing(dir); - cargo_check(dir, settings); - }, - Some((_, MILESTONE_VERSION)) => { - print_post_processing(dir); - postprocessing_after_39_0(dir); - cargo_check(dir, settings); + .contains(&to_version.version.to_string().as_str()) + { + print_post_processing(dir); + cargo_check(dir, settings); + } else if to_version.version.to_string().as_str() == "0.39.0" { + print_post_processing(dir); + postprocessing_after_39_0(dir); + cargo_check(dir, settings); + } }, _ => {}, } diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index 8b73569098..5037c02849 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -129,36 +129,36 @@ pub mod tests { use super::*; - #[test] - fn template_versions_test() { - assert!(validate_template_tag(framework_version!(0.43.0))); - assert!(!validate_template_tag(framework_version!(0.42.0))); - assert!(!validate_template_tag(framework_version!(0.47.0))); - } + // #[test] + // fn template_versions_test() { + // assert!(validate_template_tag(framework_version!(0.43.0))); + // assert!(!validate_template_tag(framework_version!(0.42.0))); + // assert!(!validate_template_tag(framework_version!(0.47.0))); + // } #[test] fn check_string_eq() { assert_eq!(VERSIONS[0].version.to_string(), "0.28.0") } - #[test] - fn template_versions_with_autogenerated_wasm_test() { - assert_eq!(template_versions_with_autogenerated_wasm()[0], "0.45.0"); + // #[test] + // fn template_versions_with_autogenerated_wasm_test() { + // assert_eq!(template_versions_with_autogenerated_wasm()[0], "0.45.0"); - assert!(is_template_with_autogenerated_wasm("0.45.0")); - assert!(!is_template_with_autogenerated_wasm("0.44.0")); - } + // assert!(is_template_with_autogenerated_wasm("0.45.0")); + // assert!(!is_template_with_autogenerated_wasm("0.44.0")); + // } - #[test] - fn template_versions_with_autogenerated_json_test() { - assert_eq!(template_versions_with_autogenerated_json()[0], "0.44.0"); + // #[test] + // fn template_versions_with_autogenerated_json_test() { + // assert_eq!(template_versions_with_autogenerated_json()[0], "0.44.0"); - assert!(is_template_with_autogenerated_json("0.44.0")); - assert!(!is_template_with_autogenerated_json("0.43.0")); - } + // assert!(is_template_with_autogenerated_json("0.44.0")); + // assert!(!is_template_with_autogenerated_json("0.43.0")); + // } #[test] fn framework_version_test() { - assert_eq!(is_sorted(ALL_VERSIONS), true); + assert_eq!(is_sorted(VERSIONS), true); } } diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs index 631664361b..fdefc3c35e 100644 --- a/framework/meta/tests/template_test.rs +++ b/framework/meta/tests/template_test.rs @@ -72,7 +72,7 @@ fn template_test_current(template_name: &str, sub_path: &str, new_name: &str) { target.clone(), true, ) - .create_contract(LAST_TEMPLATE_VERSION.to_string()); + .create_contract(LAST_TEMPLATE_VERSION); if BUILD_CONTRACTS { build_contract(&target); @@ -115,7 +115,7 @@ fn template_test_released(template_name: &str, new_name: &str) { .join("temp-download") .join(new_name); let repo_source = RepoSource::download_from_github( - RepoVersion::Tag(version_history::LAST_TEMPLATE_VERSION.to_string()), + RepoVersion::Tag(version_history::LAST_TEMPLATE_VERSION.version.to_string()), temp_dir_path, ); @@ -127,7 +127,7 @@ fn template_test_released(template_name: &str, new_name: &str) { target.clone(), false, ) - .create_contract(LAST_TEMPLATE_VERSION.to_string()); + .create_contract(LAST_TEMPLATE_VERSION); if BUILD_CONTRACTS { build_contract(&target); From 4df5adef4e244b0fbd3388bf8b49d9beef9c1183 Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Mon, 15 Jan 2024 14:37:55 +0200 Subject: [PATCH 29/84] fixed clippy --- .../meta/src/cmd/standalone/upgrade/upgrade_print.rs | 10 +++++----- .../src/cmd/standalone/upgrade/upgrade_selector.rs | 2 +- framework/meta/src/folder_structure/version_req.rs | 2 +- framework/meta/src/version_history.rs | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs index b3df63aa30..d39e1469e1 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs @@ -14,8 +14,8 @@ pub fn print_upgrading(dir: &RelevantDirectory) { "\n{}", format!( "Upgrading from {} to {} in {}\n", - from_version.version.to_string(), - to_version.version.to_string(), + from_version.version, + to_version.version, dir.path.display(), ) .purple() @@ -29,8 +29,8 @@ pub fn print_post_processing(dir: &RelevantDirectory) { "\n{}", format!( "Post-processing after upgrade from {} to {} in {}\n", - from_version.version.to_string(), - to_version.version.to_string(), + from_version.version, + to_version.version, dir.path.display(), ) .purple() @@ -113,7 +113,7 @@ pub fn print_cargo_check(dir: &RelevantDirectory) { "\n{}", format!( "Running cargo check after upgrading to version {} in {}\n", - dir.version.semver.version.to_string(), + dir.version.semver.version, dir.path.display(), ) .purple() diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs index 3b766d6db8..6024bdb03f 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs @@ -38,7 +38,7 @@ pub fn upgrade_sc(args: &UpgradeArgs) { assert!( VERSIONS.contains(&last_version), "Invalid requested version: {}", - last_version.version.to_string(), + last_version.version, ); let mut dirs = RelevantDirectories::find_all(path, args.ignore.as_slice()); diff --git a/framework/meta/src/folder_structure/version_req.rs b/framework/meta/src/folder_structure/version_req.rs index 0dd6e1341a..53811c640d 100644 --- a/framework/meta/src/folder_structure/version_req.rs +++ b/framework/meta/src/folder_structure/version_req.rs @@ -25,7 +25,7 @@ impl VersionReq { pub fn into_string(self) -> String { if self.is_strict { - format!("={}", self.semver.version.to_string()) + format!("={}", self.semver.version) } else { self.semver.version.to_string() } diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index df16188d69..82037e6e56 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -133,7 +133,7 @@ pub mod tests { let f1: FrameworkVersion = framework_version!(0.44.0); let f2: FrameworkVersion = framework_version!(0.41.2); - assert_eq!(true, f1 > f2); + assert!(f1 > f2); } #[test] @@ -168,12 +168,12 @@ pub mod tests { let version = find_version_by_str("0.28.0"); match version { Some(v) => assert_eq!(VERSIONS[0], *v), - None => assert!(false), + None => unreachable!(), } - } - + } + #[test] fn framework_version_test() { - assert_eq!(is_sorted(VERSIONS), true); + assert!(is_sorted(VERSIONS)); } } From 9b5ee09f58ea9f6a6bb121c139a46f0fbbd8b666 Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Tue, 16 Jan 2024 10:29:49 +0100 Subject: [PATCH 30/84] removed useless constraints + fmt --- .../basic-features/src/basic_features_main.rs | 2 +- .../src/storage/mappers/map_storage_mapper.rs | 9 +++--- .../base/src/storage/mappers/queue_mapper.rs | 32 +++++++------------ 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/contracts/feature-tests/basic-features/src/basic_features_main.rs b/contracts/feature-tests/basic-features/src/basic_features_main.rs index e98d5b0f26..3375fda456 100644 --- a/contracts/feature-tests/basic-features/src/basic_features_main.rs +++ b/contracts/feature-tests/basic-features/src/basic_features_main.rs @@ -23,6 +23,7 @@ pub mod storage_direct_load; pub mod storage_direct_store; pub mod storage_mapper_address_to_id; pub mod storage_mapper_fungible_token; +pub mod storage_mapper_get_at_address; pub mod storage_mapper_linked_list; pub mod storage_mapper_map; pub mod storage_mapper_map_storage; @@ -38,7 +39,6 @@ pub mod storage_raw_api_features; pub mod struct_eq; pub mod token_identifier_features; pub mod types; -pub mod storage_mapper_get_at_address; #[multiversx_sc::contract] pub trait BasicFeatures: diff --git a/framework/base/src/storage/mappers/map_storage_mapper.rs b/framework/base/src/storage/mappers/map_storage_mapper.rs index a844ac1906..cedc2d72c8 100644 --- a/framework/base/src/storage/mappers/map_storage_mapper.rs +++ b/framework/base/src/storage/mappers/map_storage_mapper.rs @@ -7,7 +7,8 @@ use super::{ use crate::{ api::StorageMapperApi, codec::{NestedDecode, NestedEncode, TopDecode, TopEncode}, - storage::{self, StorageKey}, types::ManagedAddress, + storage::{self, StorageKey}, + types::ManagedAddress, }; const MAPPED_STORAGE_VALUE_IDENTIFIER: &[u8] = b".storage"; @@ -212,8 +213,6 @@ where }) } } - - } impl<'a, SA, K, V> IntoIterator for &'a MapStorageMapper @@ -293,7 +292,9 @@ where K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: StorageMapper + StorageClearable, { - fn new(hash_map: &'a MapStorageMapper) -> Values<'a, SA, StorageSCAddress, K, V> { + fn new( + hash_map: &'a MapStorageMapper, + ) -> Values<'a, SA, StorageSCAddress, K, V> { Values { key_iter: hash_map.keys(), hash_map, diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs index 4899e9a10c..817dc0867d 100644 --- a/framework/base/src/storage/mappers/queue_mapper.rs +++ b/framework/base/src/storage/mappers/queue_mapper.rs @@ -17,7 +17,6 @@ use crate::{ types::{ManagedAddress, ManagedType, MultiValueEncoded}, }; use alloc::vec::Vec; -use codec::{NestedDecode, NestedEncode}; const NULL_ENTRY: u32 = 0; const INFO_IDENTIFIER: &[u8] = b".info"; @@ -37,13 +36,6 @@ pub struct QueueMapperInfo { pub back: u32, pub new: u32, } -impl NestedEncode for Node {} - -impl NestedDecode for Node {} - -impl NestedEncode for QueueMapperInfo {} - -impl NestedDecode for QueueMapperInfo {} impl EncodeDefault for QueueMapperInfo { fn is_default(&self) -> bool { @@ -77,7 +69,7 @@ pub struct QueueMapper where SA: StorageMapperApi, A: StorageAddress, - T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + T: TopEncode + TopDecode + 'static, { _phantom_api: PhantomData, address: A, @@ -88,7 +80,7 @@ where impl StorageMapper for QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode, + T: TopEncode + TopDecode, { fn new(base_key: StorageKey) -> Self { QueueMapper { @@ -103,7 +95,7 @@ where impl StorageClearable for QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode, + T: TopEncode + TopDecode, { fn clear(&mut self) { let info = self.get_info(); @@ -121,7 +113,7 @@ where impl QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode, + T: TopEncode + TopDecode, { fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey { let mut named_key = self.base_key.clone(); @@ -423,7 +415,7 @@ where impl QueueMapper> where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode, + T: TopEncode + TopDecode, { fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey { let mut named_key = self.base_key.clone(); @@ -579,7 +571,7 @@ where impl<'a, SA, T> IntoIterator for &'a QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + T: TopEncode + TopDecode + 'static, { type Item = T; @@ -597,7 +589,7 @@ where pub struct Iter<'a, SA, T> where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + T: TopEncode + TopDecode + 'static, { node_id: u32, queue: &'a QueueMapper, @@ -606,7 +598,7 @@ where impl<'a, SA, T> Iter<'a, SA, T> where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + T: TopEncode + TopDecode + 'static, { fn new(queue: &'a QueueMapper) -> Iter<'a, SA, T> { Iter { @@ -619,7 +611,7 @@ where impl<'a, SA, T> Iterator for Iter<'a, SA, T> where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, + T: TopEncode + TopDecode + 'static, { type Item = T; @@ -638,7 +630,7 @@ where impl TopEncodeMulti for QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode, + T: TopEncode + TopDecode, { fn multi_encode_or_handle_err(&self, output: &mut O, h: H) -> Result<(), H::HandledErr> where @@ -652,7 +644,7 @@ where impl CodecFrom> for MultiValueEncoded where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode, + T: TopEncode + TopDecode, { } @@ -660,7 +652,7 @@ where impl TypeAbi for QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi, + T: TopEncode + TopDecode + TypeAbi, { fn type_name() -> TypeName { crate::abi::type_name_variadic::() From e182e94337b9623542ad686992032f813305caae Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Tue, 16 Jan 2024 13:29:48 +0200 Subject: [PATCH 31/84] fixed issues --- framework/derive/src/format/mod.rs | 4 ++-- .../{format_version.rs => semver_tuple.rs} | 4 ++-- framework/derive/src/lib.rs | 4 ++-- .../standalone/template/contract_creator.rs | 4 ++-- .../src/cmd/standalone/template/copy_util.rs | 2 +- .../standalone/template/template_adjuster.rs | 3 ++- .../cmd/standalone/upgrade/upgrade_common.rs | 9 ++++++-- .../cmd/standalone/upgrade/upgrade_print.rs | 20 +++++++++++------- .../standalone/upgrade/upgrade_selector.rs | 13 +++++------- .../folder_structure/relevant_directory.rs | 8 +++++-- .../meta/src/folder_structure/version_req.rs | 13 ++++++++---- framework/meta/src/lib.rs | 2 +- framework/meta/src/version.rs | 15 ++++++++----- framework/meta/src/version_history.rs | 21 ++++++++++++------- framework/meta/tests/template_test.rs | 2 +- 15 files changed, 75 insertions(+), 49 deletions(-) rename framework/derive/src/format/{format_version.rs => semver_tuple.rs} (93%) diff --git a/framework/derive/src/format/mod.rs b/framework/derive/src/format/mod.rs index ec9eea78c0..a6d8e9c95c 100644 --- a/framework/derive/src/format/mod.rs +++ b/framework/derive/src/format/mod.rs @@ -1,8 +1,8 @@ mod format_args_macro; -mod format_version; mod format_parts; mod format_tokenize; +mod semver_tuple; pub use format_args_macro::*; -pub use format_version::*; pub use format_parts::*; +pub use semver_tuple::*; diff --git a/framework/derive/src/format/format_version.rs b/framework/derive/src/format/semver_tuple.rs similarity index 93% rename from framework/derive/src/format/format_version.rs rename to framework/derive/src/format/semver_tuple.rs index b3fa6fdb70..e4c3c33fcc 100644 --- a/framework/derive/src/format/format_version.rs +++ b/framework/derive/src/format/semver_tuple.rs @@ -2,7 +2,7 @@ use proc_macro::{quote, Literal}; use crate::format::format_tokenize; -pub fn format_version(input: proc_macro::TokenStream) -> proc_macro::TokenStream { +pub fn semver_tuple(input: proc_macro::TokenStream) -> proc_macro::TokenStream { let tokens: Vec = format_tokenize::tokenize(input); tokens @@ -34,4 +34,4 @@ fn u64_literal_from_str(s: &str) -> proc_macro::TokenTree { proc_macro::TokenTree::Literal(Literal::u64_suffixed( s.parse().expect("failed to parse token as u64"), )) -} \ No newline at end of file +} diff --git a/framework/derive/src/lib.rs b/framework/derive/src/lib.rs index 1fc5538aa8..a68d493c97 100644 --- a/framework/derive/src/lib.rs +++ b/framework/derive/src/lib.rs @@ -64,6 +64,6 @@ pub fn format_receiver_args(input: proc_macro::TokenStream) -> proc_macro::Token } #[proc_macro] -pub fn format_version(input: proc_macro::TokenStream) -> proc_macro::TokenStream { - format::format_version(input) +pub fn semver_tuple(input: proc_macro::TokenStream) -> proc_macro::TokenStream { + format::semver_tuple(input) } diff --git a/framework/meta/src/cmd/standalone/template/contract_creator.rs b/framework/meta/src/cmd/standalone/template/contract_creator.rs index 7a735ad3a7..d78e0d9e61 100644 --- a/framework/meta/src/cmd/standalone/template/contract_creator.rs +++ b/framework/meta/src/cmd/standalone/template/contract_creator.rs @@ -32,10 +32,10 @@ fn target_from_args(args: &TemplateArgs) -> ContractCreatorTarget { pub(crate) fn get_repo_version(args_tag: &Option) -> RepoVersion { if let Some(tag) = args_tag { - assert!(validate_template_tag(tag), "invalid template tag"); + assert!(validate_template_tag(tag), "invalid template tag"); RepoVersion::Tag(tag.clone()) } else { - RepoVersion::Tag(LAST_TEMPLATE_VERSION.version.to_string()) + RepoVersion::Tag(LAST_TEMPLATE_VERSION.to_string()) } } diff --git a/framework/meta/src/cmd/standalone/template/copy_util.rs b/framework/meta/src/cmd/standalone/template/copy_util.rs index e9ffdbe497..6a7ecc7b23 100644 --- a/framework/meta/src/cmd/standalone/template/copy_util.rs +++ b/framework/meta/src/cmd/standalone/template/copy_util.rs @@ -3,7 +3,7 @@ use std::{ path::{Path, PathBuf}, }; -use crate::{version_history::is_template_with_autogenerated_json, version::FrameworkVersion}; +use crate::{version::FrameworkVersion, version_history::is_template_with_autogenerated_json}; /// Will copy an entire folder according to a whitelist of allowed paths. /// diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs index 2f08eb8c53..5252446d50 100644 --- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs +++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs @@ -1,8 +1,9 @@ use super::{template_metadata::TemplateMetadata, ContractCreatorTarget}; use crate::{ cmd::standalone::upgrade::upgrade_common::{rename_files, replace_in_files}, + version::FrameworkVersion, version_history::is_template_with_autogenerated_wasm, - CargoTomlContents, version::FrameworkVersion, + CargoTomlContents, }; use convert_case::{Case, Casing}; use ruplacer::Query; diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs index 91fef89c69..b4ed18d07c 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_common.rs @@ -12,7 +12,8 @@ use crate::{ folder_structure::{ DirectoryType, RelevantDirectory, VersionReq, CARGO_TOML_FILE_NAME, FRAMEWORK_CRATE_NAMES, }, - CargoTomlContents, version::FrameworkVersion, + version::FrameworkVersion, + CargoTomlContents, }; use super::{upgrade_print::*, upgrade_settings::UpgradeSettings}; @@ -75,7 +76,11 @@ fn try_replace_file_name(file_name_str: &str, patterns: &[(&str, &str)]) -> Opti } /// Uses `CargoTomlContents`. Will only replace versions of framework crates. -pub fn version_bump_in_cargo_toml(path: &Path, from_version: &FrameworkVersion, to_version: &FrameworkVersion) { +pub fn version_bump_in_cargo_toml( + path: &Path, + from_version: &FrameworkVersion, + to_version: &FrameworkVersion, +) { if is_cargo_toml_file(path) { let mut cargo_toml_contents = CargoTomlContents::load_from_file(path); upgrade_all_dependency_versions( diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs index d39e1469e1..003abacaa3 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs @@ -14,8 +14,8 @@ pub fn print_upgrading(dir: &RelevantDirectory) { "\n{}", format!( "Upgrading from {} to {} in {}\n", - from_version.version, - to_version.version, + from_version, + to_version, dir.path.display(), ) .purple() @@ -29,8 +29,8 @@ pub fn print_post_processing(dir: &RelevantDirectory) { "\n{}", format!( "Post-processing after upgrade from {} to {} in {}\n", - from_version.version, - to_version.version, + from_version, + to_version, dir.path.display(), ) .purple() @@ -38,10 +38,14 @@ pub fn print_post_processing(dir: &RelevantDirectory) { } } -pub fn print_upgrading_all(from_version: &str, to_version: &str) { +pub fn print_upgrading_all(from_version: &FrameworkVersion, to_version: &FrameworkVersion) { println!( "\n{}", - format!("Upgrading from {from_version} to {to_version} across crates ...").purple() + format!( + "Upgrading from {} to {} across crates ...", + from_version, to_version + ) + .purple() ); } @@ -84,7 +88,7 @@ pub fn print_tree_dir_metadata(dir: &RelevantDirectory, last_version: &Framework Lib => print!(" {}", "[lib]".magenta()), } - let version_string = format!("[{}]", dir.version.semver.version.to_string().as_str()); + let version_string = format!("[{}]", dir.version.semver); if dir.version.semver == *last_version { print!(" {}", version_string.green()); } else { @@ -113,7 +117,7 @@ pub fn print_cargo_check(dir: &RelevantDirectory) { "\n{}", format!( "Running cargo check after upgrading to version {} in {}\n", - dir.version.semver.version, + dir.version.semver, dir.path.display(), ) .purple() diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs index 6024bdb03f..ea90987796 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs @@ -29,7 +29,7 @@ pub fn upgrade_sc(args: &UpgradeArgs) { .map(|override_target_v| { VERSIONS .iter() - .find(|v| v.version.to_string() == override_target_v) + .find(|v| v.to_string() == override_target_v) .cloned() .unwrap_or(LAST_UPGRADE_VERSION) }) @@ -56,10 +56,7 @@ pub fn upgrade_sc(args: &UpgradeArgs) { continue; } - print_upgrading_all( - from_version.version.to_string().as_str(), - to_version.version.to_string().as_str(), - ); + print_upgrading_all(from_version, to_version); dirs.start_upgrade(from_version, to_version); for dir in dirs.iter_version(from_version) { upgrade_function_selector(dir); @@ -79,7 +76,7 @@ fn upgrade_function_selector(dir: &RelevantDirectory) { } if let Some((from_version, to_version)) = dir.upgrade_in_progress { - match to_version.version.to_string().as_str() { + match to_version.to_string().as_str() { "0.31.0" => upgrade_to_31_0(dir), "0.32.0" => upgrade_to_32_0(dir), "0.39.0" => upgrade_to_39_0(dir), @@ -96,11 +93,11 @@ fn upgrade_post_processing(dir: &RelevantDirectory, settings: &UpgradeSettings) "0.36.0", "0.37.0", "0.40.0", "0.41.0", "0.42.0", "0.43.0", "0.44.0", "0.45.2", "0.46.0", ] - .contains(&to_version.version.to_string().as_str()) + .contains(&to_version.to_string().as_str()) { print_post_processing(dir); cargo_check(dir, settings); - } else if to_version.version.to_string().as_str() == "0.39.0" { + } else if to_version.to_string().as_str() == "0.39.0" { print_post_processing(dir); postprocessing_after_39_0(dir); cargo_check(dir, settings); diff --git a/framework/meta/src/folder_structure/relevant_directory.rs b/framework/meta/src/folder_structure/relevant_directory.rs index fab3f30d3a..6517c242a2 100644 --- a/framework/meta/src/folder_structure/relevant_directory.rs +++ b/framework/meta/src/folder_structure/relevant_directory.rs @@ -1,4 +1,4 @@ -use crate::{CargoTomlContents, version::FrameworkVersion}; +use crate::{version::FrameworkVersion, CargoTomlContents}; use std::{ fs::{self, DirEntry}, path::{Path, PathBuf}, @@ -100,7 +100,11 @@ impl RelevantDirectories { } /// Marks all appropriate directories as ready for upgrade. - pub fn start_upgrade(&mut self, from_version: &'static FrameworkVersion, to_version: &'static FrameworkVersion) { + pub fn start_upgrade( + &mut self, + from_version: &'static FrameworkVersion, + to_version: &'static FrameworkVersion, + ) { for dir in self.0.iter_mut() { if dir.version.semver == *from_version { dir.upgrade_in_progress = Some((from_version, to_version)); diff --git a/framework/meta/src/folder_structure/version_req.rs b/framework/meta/src/folder_structure/version_req.rs index 53811c640d..bbfa752a12 100644 --- a/framework/meta/src/folder_structure/version_req.rs +++ b/framework/meta/src/folder_structure/version_req.rs @@ -1,4 +1,7 @@ -use crate::{version::FrameworkVersion, version_history::{find_version_by_str, LAST_VERSION}}; +use crate::{ + version::FrameworkVersion, + version_history::{find_version_by_str, LAST_VERSION}, +}; /// Crate version requirements, as expressed in Cargo.toml. A very crude version. /// @@ -12,7 +15,9 @@ impl VersionReq { pub fn from_string(raw: String) -> Self { if let Some(stripped_version) = raw.strip_prefix('=') { VersionReq { - semver: find_version_by_str(stripped_version).unwrap_or(&LAST_VERSION).clone(), + semver: find_version_by_str(stripped_version) + .unwrap_or(&LAST_VERSION) + .clone(), is_strict: true, } } else { @@ -25,9 +30,9 @@ impl VersionReq { pub fn into_string(self) -> String { if self.is_strict { - format!("={}", self.semver.version) + format!("={}", self.semver) } else { - self.semver.version.to_string() + self.semver.to_string() } } } diff --git a/framework/meta/src/lib.rs b/framework/meta/src/lib.rs index 6d34abf4bd..f543392f2a 100644 --- a/framework/meta/src/lib.rs +++ b/framework/meta/src/lib.rs @@ -9,8 +9,8 @@ mod mxsc_file_json; mod print_util; mod tools; pub use tools::find_workspace; -pub mod version_history; pub mod version; +pub mod version_history; #[macro_use] extern crate lazy_static; diff --git a/framework/meta/src/version.rs b/framework/meta/src/version.rs index eecf6aac26..d4cf732e81 100644 --- a/framework/meta/src/version.rs +++ b/framework/meta/src/version.rs @@ -1,3 +1,4 @@ +use core::fmt; use std::cmp::Ordering; use semver::{BuildMetadata, Prerelease, Version}; @@ -25,7 +26,7 @@ impl FrameworkVersion { FrameworkVersion::new(major, minor, patch) } - pub fn from_string_template(version_str: &str) -> Self { + pub fn from_string_template(version_str: &str) -> Self { let version_arr: Vec<&str> = version_str.split('.').collect(); let major: u64 = version_arr[0].parse().unwrap(); @@ -54,16 +55,20 @@ impl PartialEq for FrameworkVersion { } } +impl fmt::Display for FrameworkVersion { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{}", self.version) + } +} + pub fn is_sorted(versions: &[FrameworkVersion]) -> bool { - versions - .windows(2) - .all(|window| (window[0].cmp(&window[1])).eq(&Ordering::Less)) + versions.windows(2).all(|window| (window[0] < window[1])) } #[macro_export] macro_rules! framework_version { ($arg:expr) => { - FrameworkVersion::from_triple(multiversx_sc::derive::format_version!($arg)) + FrameworkVersion::from_triple(multiversx_sc::derive::semver_tuple!($arg)) }; } diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index 82037e6e56..b28b3ce589 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -8,7 +8,7 @@ pub const LAST_VERSION: FrameworkVersion = framework_version!(0.46.1); /// Indicates where to stop with the upgrades. pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION; -pub const LAST_TEMPLATE_VERSION: FrameworkVersion = framework_version!(0.45.2); +pub const LAST_TEMPLATE_VERSION: FrameworkVersion = LAST_VERSION; #[rustfmt::skip] /// Known versions for the upgrader. @@ -59,27 +59,27 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![ 0.46.1, ]; -pub const LOWER_VERSION_WITH_TEMPLATE_TAG: &FrameworkVersion = &VERSIONS[33]; -pub const TEMPLATE_VERSIONS_WITH_AUTOGENERATED_WASM: &FrameworkVersion = &VERSIONS[40]; -pub const TEMPLATE_VERSIONS_WITH_AUTOGENERATED_JSON: &FrameworkVersion = &VERSIONS[39]; +pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0); +pub const LOWER_VERSION_WITH_AUTOGENERATED_JSON: FrameworkVersion = framework_version!(0.44.0); +pub const LOWER_VERSION_WITH_AUTOGENERATED_WASM: FrameworkVersion = framework_version!(0.45.0); /// We started supporting contract templates with version 0.43.0. pub fn validate_template_tag(tag_str: &str) -> bool { let tag: FrameworkVersion = FrameworkVersion::from_string_template(tag_str); - tag >= *LOWER_VERSION_WITH_TEMPLATE_TAG && tag <= LAST_VERSION + tag >= LOWER_VERSION_WITH_TEMPLATE_TAG && tag <= LAST_VERSION } pub fn is_template_with_autogenerated_wasm(tag: FrameworkVersion) -> bool { - tag >= *TEMPLATE_VERSIONS_WITH_AUTOGENERATED_WASM + tag >= LOWER_VERSION_WITH_AUTOGENERATED_WASM } pub fn is_template_with_autogenerated_json(tag: FrameworkVersion) -> bool { - tag >= *TEMPLATE_VERSIONS_WITH_AUTOGENERATED_JSON + tag >= LOWER_VERSION_WITH_AUTOGENERATED_JSON } pub fn find_version_by_str(tag: &str) -> Option<&FrameworkVersion> { - VERSIONS.iter().find(|&v| v.version.to_string() == tag) + VERSIONS.iter().find(|&v| v.to_string() == tag) } pub struct VersionIterator { @@ -136,6 +136,11 @@ pub mod tests { assert!(f1 > f2); } + #[test] + fn framework_version_display_test() { + assert_eq!(format!("Framework: {}", VERSIONS[0]), "Framework: 0.28.0"); + } + #[test] fn template_versions_test() { assert!(validate_template_tag("0.43.0")); diff --git a/framework/meta/tests/template_test.rs b/framework/meta/tests/template_test.rs index fdefc3c35e..f76db34407 100644 --- a/framework/meta/tests/template_test.rs +++ b/framework/meta/tests/template_test.rs @@ -115,7 +115,7 @@ fn template_test_released(template_name: &str, new_name: &str) { .join("temp-download") .join(new_name); let repo_source = RepoSource::download_from_github( - RepoVersion::Tag(version_history::LAST_TEMPLATE_VERSION.version.to_string()), + RepoVersion::Tag(version_history::LAST_TEMPLATE_VERSION.to_string()), temp_dir_path, ); From 66754a4af8253e08c9a7bac4206e2e33c1a17ac5 Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Tue, 16 Jan 2024 15:58:53 +0200 Subject: [PATCH 32/84] fixed all issues: removed 'static lifetime --- .../cmd/standalone/upgrade/upgrade_0_31.rs | 4 +-- .../cmd/standalone/upgrade/upgrade_0_32.rs | 4 +-- .../cmd/standalone/upgrade/upgrade_0_39.rs | 4 +-- .../cmd/standalone/upgrade/upgrade_0_45.rs | 4 +-- .../cmd/standalone/upgrade/upgrade_print.rs | 4 +-- .../standalone/upgrade/upgrade_selector.rs | 36 +++++++++---------- .../folder_structure/relevant_directory.rs | 14 +++----- framework/meta/src/version_history.rs | 21 +++++++++++ 8 files changed, 54 insertions(+), 37 deletions(-) diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_31.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_0_31.rs index dcd2afde30..234c2b972b 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_31.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_0_31.rs @@ -7,8 +7,8 @@ use std::path::Path; pub fn upgrade_to_31_0(dir: &RelevantDirectory) { v_0_31_replace_in_files(dir.path.as_ref()); - let (from_version, to_version) = dir.upgrade_in_progress.unwrap(); - version_bump_in_cargo_toml(&dir.path, from_version, to_version); + let (from_version, to_version) = dir.upgrade_in_progress.clone().unwrap(); + version_bump_in_cargo_toml(&dir.path, &from_version, &to_version); } fn v_0_31_replace_in_files(sc_crate_path: &Path) { diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_32.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_0_32.rs index 8f6c2978ad..fa234ef04c 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_32.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_0_32.rs @@ -7,8 +7,8 @@ use std::path::Path; pub fn upgrade_to_32_0(dir: &RelevantDirectory) { v_0_32_replace_in_files(dir.path.as_ref()); - let (from_version, to_version) = dir.upgrade_in_progress.unwrap(); - version_bump_in_cargo_toml(&dir.path, from_version, to_version); + let (from_version, to_version) = dir.upgrade_in_progress.clone().unwrap(); + version_bump_in_cargo_toml(&dir.path, &from_version, &to_version); } fn v_0_32_replace_in_files(sc_crate_path: &Path) { diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_39.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_0_39.rs index 4635fcd8c3..0ccd8dbf81 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_39.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_0_39.rs @@ -28,8 +28,8 @@ pub fn upgrade_to_39_0(dir: &RelevantDirectory) { v_0_39_replace_in_files(&dir.path); rename_files(dir.path.as_ref(), SCENARIO_FILE_PATTERNS); - let (from_version, to_version) = dir.upgrade_in_progress.unwrap(); - version_bump_in_cargo_toml(&dir.path, from_version, to_version); + let (from_version, to_version) = dir.upgrade_in_progress.clone().unwrap(); + version_bump_in_cargo_toml(&dir.path, &from_version, &to_version); } /// Post-processing: re-generate the wasm crates. diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs index b573820c6f..21aa59ca1c 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_0_45.rs @@ -12,8 +12,8 @@ pub fn upgrade_to_45_0(dir: &RelevantDirectory) { if dir.dir_type == DirectoryType::Contract { v_0_45_prepare_meta(&dir.path); } - let (from_version, to_version) = dir.upgrade_in_progress.unwrap(); - version_bump_in_cargo_toml(&dir.path, from_version, to_version); + let (from_version, to_version) = dir.upgrade_in_progress.clone().unwrap(); + version_bump_in_cargo_toml(&dir.path, &from_version, &to_version); } fn v_0_45_prepare_meta(sc_crate_path: &Path) { diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs index 003abacaa3..51d66f9333 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_print.rs @@ -9,7 +9,7 @@ use colored::Colorize; use std::path::Path; pub fn print_upgrading(dir: &RelevantDirectory) { - if let Some((from_version, to_version)) = dir.upgrade_in_progress { + if let Some((from_version, to_version)) = &dir.upgrade_in_progress { println!( "\n{}", format!( @@ -24,7 +24,7 @@ pub fn print_upgrading(dir: &RelevantDirectory) { } pub fn print_post_processing(dir: &RelevantDirectory) { - if let Some((from_version, to_version)) = dir.upgrade_in_progress { + if let Some((from_version, to_version)) = &dir.upgrade_in_progress { println!( "\n{}", format!( diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs index ea90987796..d7b86f9895 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs @@ -2,7 +2,9 @@ use crate::{ cli_args::UpgradeArgs, cmd::standalone::upgrade::upgrade_settings::UpgradeSettings, folder_structure::{dir_pretty_print, RelevantDirectories, RelevantDirectory}, - version_history::{versions_iter, LAST_UPGRADE_VERSION, VERSIONS}, + framework_version, + version::FrameworkVersion, + version_history::{versions_iter, CHECK_AFTER_UPGRADE_TO, LAST_UPGRADE_VERSION, VERSIONS}, }; use super::{ @@ -57,7 +59,7 @@ pub fn upgrade_sc(args: &UpgradeArgs) { } print_upgrading_all(from_version, to_version); - dirs.start_upgrade(from_version, to_version); + dirs.start_upgrade(from_version.clone(), to_version.clone()); for dir in dirs.iter_version(from_version) { upgrade_function_selector(dir); } @@ -75,29 +77,27 @@ fn upgrade_function_selector(dir: &RelevantDirectory) { print_upgrading(dir); } - if let Some((from_version, to_version)) = dir.upgrade_in_progress { - match to_version.to_string().as_str() { - "0.31.0" => upgrade_to_31_0(dir), - "0.32.0" => upgrade_to_32_0(dir), - "0.39.0" => upgrade_to_39_0(dir), - "0.45.0" => upgrade_to_45_0(dir), - _ => version_bump_in_cargo_toml(&dir.path, from_version, to_version), + if let Some((from_version, to_version)) = &dir.upgrade_in_progress { + if framework_version!(0.31.0) == *to_version { + upgrade_to_31_0(dir) + } else if framework_version!(0.32.0) == *to_version { + upgrade_to_32_0(dir) + } else if framework_version!(0.39.0) == *to_version { + upgrade_to_39_0(dir) + } else if framework_version!(0.45.0) == *to_version { + upgrade_to_45_0(dir) + } else { + version_bump_in_cargo_toml(&dir.path, from_version, to_version) } } } fn upgrade_post_processing(dir: &RelevantDirectory, settings: &UpgradeSettings) { - if let Some((_, to_version)) = dir.upgrade_in_progress { - if [ - "0.28.0", "0.29.0", "0.30.0", "0.31.0", "0.32.0", "0.33.0", "0.34.0", "0.35.0", - "0.36.0", "0.37.0", "0.40.0", "0.41.0", "0.42.0", "0.43.0", "0.44.0", "0.45.2", - "0.46.0", - ] - .contains(&to_version.to_string().as_str()) - { + if let Some((_, to_version)) = &dir.upgrade_in_progress { + if CHECK_AFTER_UPGRADE_TO.contains(&to_version) { print_post_processing(dir); cargo_check(dir, settings); - } else if to_version.to_string().as_str() == "0.39.0" { + } else if framework_version!(0.39.0) == *to_version { print_post_processing(dir); postprocessing_after_39_0(dir); cargo_check(dir, settings); diff --git a/framework/meta/src/folder_structure/relevant_directory.rs b/framework/meta/src/folder_structure/relevant_directory.rs index 6517c242a2..f49b1d07ca 100644 --- a/framework/meta/src/folder_structure/relevant_directory.rs +++ b/framework/meta/src/folder_structure/relevant_directory.rs @@ -33,7 +33,7 @@ pub enum DirectoryType { pub struct RelevantDirectory { pub path: PathBuf, pub version: VersionReq, - pub upgrade_in_progress: Option<(&'static FrameworkVersion, &'static FrameworkVersion)>, + pub upgrade_in_progress: Option<(FrameworkVersion, FrameworkVersion)>, pub dir_type: DirectoryType, } @@ -100,14 +100,10 @@ impl RelevantDirectories { } /// Marks all appropriate directories as ready for upgrade. - pub fn start_upgrade( - &mut self, - from_version: &'static FrameworkVersion, - to_version: &'static FrameworkVersion, - ) { + pub fn start_upgrade(&mut self, from_version: FrameworkVersion, to_version: FrameworkVersion) { for dir in self.0.iter_mut() { - if dir.version.semver == *from_version { - dir.upgrade_in_progress = Some((from_version, to_version)); + if dir.version.semver == from_version { + dir.upgrade_in_progress = Some((from_version.clone(), to_version.clone())); } } } @@ -116,7 +112,7 @@ impl RelevantDirectories { /// and resets upgrade status. pub fn finish_upgrade(&mut self) { for dir in self.0.iter_mut() { - if let Some((_, to_version)) = dir.upgrade_in_progress { + if let Some((_, to_version)) = &dir.upgrade_in_progress { dir.version.semver = to_version.clone(); dir.upgrade_in_progress = None; } diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index b28b3ce589..40d56b8f3c 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -59,6 +59,27 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![ 0.46.1, ]; +#[rustfmt::skip] +pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![ + 0.28.0, + 0.29.0, + 0.30.0, + 0.31.0, + 0.32.0, + 0.33.0, + 0.34.0, + 0.35.0, + 0.36.0, + 0.37.0, + 0.40.0, + 0.41.0, + 0.42.0, + 0.43.0, + 0.44.0, + 0.45.2, + 0.46.0 +]; + pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0); pub const LOWER_VERSION_WITH_AUTOGENERATED_JSON: FrameworkVersion = framework_version!(0.44.0); pub const LOWER_VERSION_WITH_AUTOGENERATED_WASM: FrameworkVersion = framework_version!(0.45.0); From 5650e380aa13622631da64f7247d1fc33be6aa0e Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Tue, 16 Jan 2024 16:07:47 +0200 Subject: [PATCH 33/84] fixed clippy --- framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs index d7b86f9895..e2d0ef4d86 100644 --- a/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs +++ b/framework/meta/src/cmd/standalone/upgrade/upgrade_selector.rs @@ -94,7 +94,7 @@ fn upgrade_function_selector(dir: &RelevantDirectory) { fn upgrade_post_processing(dir: &RelevantDirectory, settings: &UpgradeSettings) { if let Some((_, to_version)) = &dir.upgrade_in_progress { - if CHECK_AFTER_UPGRADE_TO.contains(&to_version) { + if CHECK_AFTER_UPGRADE_TO.contains(to_version) { print_post_processing(dir); cargo_check(dir, settings); } else if framework_version!(0.39.0) == *to_version { From 912bbde86fc36a0a59596a8f222acb360ca7be57 Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Wed, 17 Jan 2024 12:42:08 +0200 Subject: [PATCH 34/84] validate all framework version when parsing --- framework/meta/src/version_history.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index 40d56b8f3c..94876976d1 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -84,11 +84,20 @@ pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version! pub const LOWER_VERSION_WITH_AUTOGENERATED_JSON: FrameworkVersion = framework_version!(0.44.0); pub const LOWER_VERSION_WITH_AUTOGENERATED_WASM: FrameworkVersion = framework_version!(0.45.0); +pub fn parse_known_version(tag_str: &str) -> FrameworkVersion { + let tag: FrameworkVersion = FrameworkVersion::from_string_template(tag_str); + if VERSIONS.contains(&tag) { + tag + } else { + panic!("Version unknown") + } +} + /// We started supporting contract templates with version 0.43.0. pub fn validate_template_tag(tag_str: &str) -> bool { - let tag: FrameworkVersion = FrameworkVersion::from_string_template(tag_str); + let tag: FrameworkVersion = parse_known_version(tag_str); - tag >= LOWER_VERSION_WITH_TEMPLATE_TAG && tag <= LAST_VERSION + tag >= LOWER_VERSION_WITH_TEMPLATE_TAG } pub fn is_template_with_autogenerated_wasm(tag: FrameworkVersion) -> bool { From f89dea71feeecd9e99ee0a1f7c9f7a45063b0d1f Mon Sep 17 00:00:00 2001 From: BiancaIalangi Date: Wed, 17 Jan 2024 13:09:01 +0200 Subject: [PATCH 35/84] fixed tests --- framework/meta/src/version_history.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index 94876976d1..8e2fc6d5be 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -175,7 +175,6 @@ pub mod tests { fn template_versions_test() { assert!(validate_template_tag("0.43.0")); assert!(!validate_template_tag("0.42.0")); - assert!(!validate_template_tag("0.47.0")); } #[test] From e5d49ff499ff9991415a4b1910ce62ecde226d17 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Wed, 17 Jan 2024 13:20:37 +0200 Subject: [PATCH 36/84] code metadata in composability tests --- .../src/forwarder_raw_deploy_upgrade.rs | 12 ++++++++---- .../composability/forwarder/src/contract_upgrade.rs | 2 +- .../proxy-test-first/src/proxy-test-first.rs | 4 ++-- .../scenarios/forw_raw_contract_deploy.scen.json | 8 +++++++- .../scenarios/forw_raw_contract_upgrade.scen.json | 10 +++++++--- .../forw_raw_contract_upgrade_self.scen.json | 4 +++- .../scenarios/forwarder_contract_upgrade.scen.json | 4 +++- 7 files changed, 31 insertions(+), 13 deletions(-) diff --git a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_deploy_upgrade.rs b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_deploy_upgrade.rs index df0f6628c1..1f89186e0e 100644 --- a/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_deploy_upgrade.rs +++ b/contracts/feature-tests/composability/forwarder-raw/src/forwarder_raw_deploy_upgrade.rs @@ -6,6 +6,7 @@ pub trait ForwarderRawDeployUpgrade { fn deploy_contract( &self, code: ManagedBuffer, + code_metadata: CodeMetadata, args: MultiValueEncoded, ) -> MultiValue2> { self.send_raw() @@ -13,7 +14,7 @@ pub trait ForwarderRawDeployUpgrade { self.blockchain().get_gas_left(), &BigUint::zero(), &code, - CodeMetadata::DEFAULT, + code_metadata, &args.to_arg_buffer(), ) .into() @@ -23,13 +24,14 @@ pub trait ForwarderRawDeployUpgrade { fn deploy_from_source( &self, source_contract_address: ManagedAddress, + code_metadata: CodeMetadata, arguments: MultiValueEncoded, ) -> ManagedAddress { let (address, _) = self.send_raw().deploy_from_source_contract( self.blockchain().get_gas_left(), &BigUint::zero(), &source_contract_address, - CodeMetadata::DEFAULT, + code_metadata, &arguments.to_arg_buffer(), ); @@ -41,6 +43,7 @@ pub trait ForwarderRawDeployUpgrade { &self, child_sc_address: &ManagedAddress, new_code: &ManagedBuffer, + code_metadata: CodeMetadata, arguments: MultiValueEncoded, ) { self.send_raw().upgrade_contract( @@ -48,7 +51,7 @@ pub trait ForwarderRawDeployUpgrade { self.blockchain().get_gas_left(), &BigUint::zero(), new_code, - CodeMetadata::UPGRADEABLE, + code_metadata, &arguments.to_arg_buffer(), ); } @@ -58,6 +61,7 @@ pub trait ForwarderRawDeployUpgrade { &self, sc_address: ManagedAddress, source_contract_address: ManagedAddress, + code_metadata: CodeMetadata, arguments: MultiValueEncoded, ) { self.send_raw().upgrade_from_source_contract( @@ -65,7 +69,7 @@ pub trait ForwarderRawDeployUpgrade { self.blockchain().get_gas_left(), &BigUint::zero(), &source_contract_address, - CodeMetadata::DEFAULT, + code_metadata, &arguments.to_arg_buffer(), ) } diff --git a/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs b/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs index 0a8241978c..b1629eeaa1 100644 --- a/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs +++ b/contracts/feature-tests/composability/forwarder/src/contract_upgrade.rs @@ -26,6 +26,6 @@ pub trait UpgradeContractModule { ) { self.vault_proxy(child_sc_address) .init(opt_arg) - .upgrade_from_source(&source_address, CodeMetadata::DEFAULT) + .upgrade_from_source(&source_address, CodeMetadata::UPGRADEABLE) } } diff --git a/contracts/feature-tests/composability/proxy-test-first/src/proxy-test-first.rs b/contracts/feature-tests/composability/proxy-test-first/src/proxy-test-first.rs index 9b4b26ccb0..d84f36e5fa 100644 --- a/contracts/feature-tests/composability/proxy-test-first/src/proxy-test-first.rs +++ b/contracts/feature-tests/composability/proxy-test-first/src/proxy-test-first.rs @@ -66,7 +66,7 @@ pub trait ProxyTestFirst { .message_me_proxy() .init(123) .with_egld_transfer(payment.clone_value()) - .deploy_contract::(&code, CodeMetadata::DEFAULT); + .deploy_contract::(&code, CodeMetadata::UPGRADEABLE); self.set_other_contract(&address); init_result + 1 } @@ -81,7 +81,7 @@ pub trait ProxyTestFirst { .contract(other_contract) .init(456) // TODO: upgrade proxy .with_egld_transfer(payment.clone_value()) - .upgrade_contract(&code, CodeMetadata::DEFAULT); + .upgrade_contract(&code, CodeMetadata::UPGRADEABLE); } #[payable("EGLD")] diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json index 3019e05d6e..1a0349a613 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json @@ -40,7 +40,8 @@ "to": "sc:forwarder", "function": "deploy_contract", "arguments": [ - "file:../vault/output/vault.wasm" + "file:../vault/output/vault.wasm", + "0x0100" ], "gasLimit": "50,000,000", "gasPrice": "0" @@ -64,6 +65,7 @@ "balance": "0", "storage": {}, "code": "file:../vault/output/vault.wasm", + "codeMetadata": "0x0100", "owner": "sc:forwarder" }, "+": "" @@ -78,6 +80,7 @@ "function": "deploy_contract", "arguments": [ "file:../vault/output/vault.wasm", + "0x0100", "str:some_argument" ], "gasLimit": "50,000,000", @@ -103,6 +106,7 @@ "balance": "0", "storage": {}, "code": "file:../vault/output/vault.wasm", + "codeMetadata": "0x0100", "owner": "sc:forwarder" }, "+": "" @@ -117,6 +121,7 @@ "function": "deploy_from_source", "arguments": [ "sc:child", + "0x0100", "str:some_argument" ], "gasLimit": "50,000,000", @@ -141,6 +146,7 @@ "balance": "0", "storage": {}, "code": "file:../vault/output/vault.wasm", + "codeMetadata": "0x0100", "owner": "sc:forwarder" }, "+": "" diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json index 025d40985c..458e9bacc6 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json @@ -26,7 +26,8 @@ "function": "call_upgrade_from_source", "arguments": [ "sc:child", - "sc:reference" + "sc:reference", + "0x0102" ], "gasLimit": "500,000,000", "gasPrice": "0" @@ -40,7 +41,8 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../vault/output/vault-upgrade.wasm" + "code": "file:../vault/output/vault-upgrade.wasm", + "codeMetadata": "0x0102" }, "+": "" } @@ -55,6 +57,7 @@ "arguments": [ "sc:child", "file:../vault/output/vault.wasm", + "0x0102", "str:upgrade-init-arg" ], "gasLimit": "500,000,000", @@ -71,7 +74,8 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../vault/output/vault.wasm" + "code": "file:../vault/output/vault.wasm", + "codeMetadata": "0x0102" }, "+": "" } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json index 488d3b24d0..a4feba6974 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json @@ -23,7 +23,8 @@ "function": "call_upgrade_from_source", "arguments": [ "sc:forwarder", - "sc:reference" + "sc:reference", + "0x0102" ], "gasLimit": "500,000,000", "gasPrice": "0" @@ -42,6 +43,7 @@ }, "sc:forwarder": { "code": "file:../vault/output/vault-upgrade.wasm", + "codeMetadata": "0x0102", "owner": "sc:forwarder" }, "sc:reference": { diff --git a/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json index c4461a48dc..86d0c58ba3 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json @@ -40,7 +40,8 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../vault/output/vault-upgrade.wasm" + "code": "file:../vault/output/vault-upgrade.wasm", + "codeMetadata": "0x0100" }, "+": "" } @@ -63,6 +64,7 @@ }, "expect": { "out": "*", + "status": "", "logs": [ { "address": "sc:forwarder", From d146c7441cd2ea650796006fb5254e27b7170b38 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Thu, 18 Jan 2024 10:00:26 +0200 Subject: [PATCH 37/84] scenario code metadata --- .../scenario/model/account_data/account.rs | 5 ++ .../model/account_data/account_check.rs | 3 ++ .../scenario/model/transaction/tx_deploy.rs | 2 +- .../scenario/model/transaction/tx_response.rs | 18 ++++--- .../src/scenario/run_vm/check_state.rs | 9 ++++ .../scenario/src/scenario/run_vm/sc_deploy.rs | 2 + .../scenario/src/scenario/run_vm/set_state.rs | 10 +++- .../scenario/src/standalone/account_tool.rs | 1 + .../src/whitebox_legacy/raw_converter.rs | 14 +++-- .../set-check/set-check-codemetadata.err.json | 24 +++++++++ .../set-check-codemetadata.scen.json | 52 +++++++++++++++++++ .../scenario/tests/scenarios_self_test.rs | 11 ++++ .../serde_raw/account_data_raw/account_raw.rs | 4 ++ .../account_data_raw/account_raw_check.rs | 4 ++ .../general/upgrade_contract.rs | 10 ++-- vm/src/tx_execution/exec_call.rs | 5 +- vm/src/tx_execution/exec_create.rs | 5 +- vm/src/tx_execution/exec_general_tx.rs | 10 +++- vm/src/tx_mock/tx_context.rs | 5 +- vm/src/types/vm_code_metadata.rs | 14 ++++- vm/src/vm_hooks/vh_impl/vh_debug_api.rs | 3 +- vm/src/world_mock/account_data.rs | 7 ++- 22 files changed, 191 insertions(+), 27 deletions(-) create mode 100644 framework/scenario/tests/scenarios-self/set-check/set-check-codemetadata.err.json create mode 100644 framework/scenario/tests/scenarios-self/set-check/set-check-codemetadata.scen.json diff --git a/framework/scenario/src/scenario/model/account_data/account.rs b/framework/scenario/src/scenario/model/account_data/account.rs index 912d8d94f5..8488017c4e 100644 --- a/framework/scenario/src/scenario/model/account_data/account.rs +++ b/framework/scenario/src/scenario/model/account_data/account.rs @@ -19,6 +19,7 @@ pub struct Account { pub username: Option, pub storage: BTreeMap, pub code: Option, + pub code_metadata: Option, pub owner: Option, pub developer_rewards: Option, } @@ -210,6 +211,9 @@ impl InterpretableFrom for Account { }) .collect(), code: from.code.map(|c| BytesValue::interpret_from(c, context)), + code_metadata: from + .code_metadata + .map(|c| BytesValue::interpret_from(c, context)), owner: from.owner.map(|v| AddressValue::interpret_from(v, context)), developer_rewards: from .developer_rewards @@ -236,6 +240,7 @@ impl IntoRaw for Account { .map(|(key, value)| (key.original, value.original)) .collect(), code: self.code.map(|n| n.original), + code_metadata: self.code_metadata.map(|n| n.original), owner: self.owner.map(|n| n.original), developer_rewards: self.developer_rewards.map(|n| n.original), } diff --git a/framework/scenario/src/scenario/model/account_data/account_check.rs b/framework/scenario/src/scenario/model/account_data/account_check.rs index 2366941c02..901d224541 100644 --- a/framework/scenario/src/scenario/model/account_data/account_check.rs +++ b/framework/scenario/src/scenario/model/account_data/account_check.rs @@ -22,6 +22,7 @@ pub struct CheckAccount { pub username: CheckValue, pub storage: CheckStorage, pub code: CheckValue, + pub code_metadata: CheckValue, pub owner: CheckValue, // WARNING! Not currently checked. TODO: implement check pub developer_rewards: CheckValue, pub async_call_data: CheckValue, @@ -175,6 +176,7 @@ impl InterpretableFrom> for CheckAccount { username: CheckValue::::interpret_from(from.username, context), storage: CheckStorage::interpret_from(from.storage, context), code: CheckValue::::interpret_from(from.code, context), + code_metadata: CheckValue::::interpret_from(from.code_metadata, context), owner: CheckValue::::interpret_from(from.owner, context), developer_rewards: CheckValue::::interpret_from( from.developer_rewards, @@ -198,6 +200,7 @@ impl IntoRaw for CheckAccount { username: self.username.into_raw(), storage: self.storage.into_raw(), code: self.code.into_raw_explicit(), // TODO: convert back to into_raw after VM CI upgrade + code_metadata: self.code_metadata.into_raw(), owner: self.owner.into_raw_explicit(), // TODO: convert back to into_raw after VM CI upgrade developer_rewards: self.developer_rewards.into_raw(), async_call_data: self.async_call_data.into_raw(), diff --git a/framework/scenario/src/scenario/model/transaction/tx_deploy.rs b/framework/scenario/src/scenario/model/transaction/tx_deploy.rs index 77fb59cea8..ba6f0c44ca 100644 --- a/framework/scenario/src/scenario/model/transaction/tx_deploy.rs +++ b/framework/scenario/src/scenario/model/transaction/tx_deploy.rs @@ -13,8 +13,8 @@ use super::{tx_interpret_util::interpret_egld_value, DEFAULT_GAS_EXPR}; pub struct TxDeploy { pub from: AddressValue, pub egld_value: BigUintValue, - pub code_metadata: CodeMetadata, pub contract_code: BytesValue, + pub code_metadata: CodeMetadata, pub arguments: Vec, pub gas_limit: U64Value, pub gas_price: U64Value, diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs index 1f34d6c12e..f73641c9c9 100644 --- a/framework/scenario/src/scenario/model/transaction/tx_response.rs +++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs @@ -175,11 +175,11 @@ impl TxResponse { fn process_new_issued_token_identifier(mut self) -> Self { for scr in self.api_scrs.iter() { if scr.sender.to_string() != SYSTEM_SC_BECH32 { - continue + continue; } let Some(prev_tx) = self.api_scrs.iter().find(|e| e.hash == scr.prev_tx_hash) else { - continue + continue; }; let is_issue_fungible = prev_tx.data.starts_with("issue@"); @@ -187,7 +187,11 @@ impl TxResponse { let is_issue_non_fungible = prev_tx.data.starts_with("issueNonFungible@"); let is_register_meta_esdt = prev_tx.data.starts_with("registerMetaESDT@"); - if !is_issue_fungible && !is_issue_semi_fungible && !is_issue_non_fungible && !is_register_meta_esdt { + if !is_issue_fungible + && !is_issue_semi_fungible + && !is_issue_non_fungible + && !is_register_meta_esdt + { continue; } @@ -197,7 +201,8 @@ impl TxResponse { return self; } - self.new_issued_token_identifier = Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap()); + self.new_issued_token_identifier = + Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap()); break; } else if scr.data.starts_with("@00@") { @@ -206,7 +211,8 @@ impl TxResponse { return self; } - self.new_issued_token_identifier = Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap()); + self.new_issued_token_identifier = + Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap()); break; } @@ -1261,7 +1267,6 @@ mod tests { let expected: Option = Some("EGLDMEX-95c6d5".to_string()); assert_eq!(tx_response.new_issued_token_identifier, expected) - } #[test] @@ -1978,7 +1983,6 @@ mod tests { let expected: Option = Some("AVASH-7d8b5d".to_string()); assert_eq!(tx_response.new_issued_token_identifier, expected) - } #[test] diff --git a/framework/scenario/src/scenario/run_vm/check_state.rs b/framework/scenario/src/scenario/run_vm/check_state.rs index fae07c3591..abed0212cc 100644 --- a/framework/scenario/src/scenario/run_vm/check_state.rs +++ b/framework/scenario/src/scenario/run_vm/check_state.rs @@ -58,6 +58,15 @@ fn execute(state: &BlockchainState, accounts: &CheckAccounts) { actual_code.len(), ); + let actual_code_metadata = account.code_metadata.to_vec(); + assert!( + expected_account.code_metadata.check(&actual_code_metadata), + "bad account code metadata. Address: {}. Want: {}. Have: {}", + expected_address, + expected_account.code_metadata, + hex::encode(actual_code_metadata), + ); + assert!( expected_account .developer_rewards diff --git a/framework/scenario/src/scenario/run_vm/sc_deploy.rs b/framework/scenario/src/scenario/run_vm/sc_deploy.rs index 67540877c6..11bb387a6b 100644 --- a/framework/scenario/src/scenario/run_vm/sc_deploy.rs +++ b/framework/scenario/src/scenario/run_vm/sc_deploy.rs @@ -5,6 +5,7 @@ use crate::{ use multiversx_chain_vm::{ tx_execution::execute_current_tx_context_input, tx_mock::{TxFunctionName, TxInput, TxResult}, + types::VMCodeMetadata, }; use super::{check_tx_output, tx_input_util::generate_tx_hash, ScenarioVMRunner}; @@ -34,6 +35,7 @@ impl ScenarioVMRunner { let (new_address, tx_result) = self.blockchain_mock.vm.sc_create( tx_input, contract_code, + VMCodeMetadata::from(sc_deploy_step.tx.code_metadata.bits()), &mut self.blockchain_mock.state, f, ); diff --git a/framework/scenario/src/scenario/run_vm/set_state.rs b/framework/scenario/src/scenario/run_vm/set_state.rs index c09804ae1b..187ba21e83 100644 --- a/framework/scenario/src/scenario/run_vm/set_state.rs +++ b/framework/scenario/src/scenario/run_vm/set_state.rs @@ -1,7 +1,7 @@ use crate::scenario::model::SetStateStep; use multiversx_chain_vm::{ - types::VMAddress, + types::{VMAddress, VMCodeMetadata}, world_mock::{ AccountData, AccountEsdt, BlockInfo as CrateBlockInfo, BlockchainState, EsdtData, EsdtInstance, EsdtInstanceMetadata, EsdtInstances, EsdtRoles, @@ -10,6 +10,9 @@ use multiversx_chain_vm::{ use super::ScenarioVMRunner; +/// Refers to the default of the "setState" scenario step. +pub const DEFAULT_CODE_METADATA: VMCodeMetadata = VMCodeMetadata::all(); + impl ScenarioVMRunner { pub fn perform_set_state(&mut self, set_state_step: &SetStateStep) { execute(&mut self.blockchain_mock.state, set_state_step); @@ -54,6 +57,11 @@ fn execute(state: &mut BlockchainState, set_state_step: &SetStateStep) { .code .as_ref() .map(|bytes_value| bytes_value.value.clone()), + code_metadata: account + .code_metadata + .as_ref() + .map(|bytes_value| VMCodeMetadata::from(&bytes_value.value)) + .unwrap_or(DEFAULT_CODE_METADATA), contract_owner: account .owner .as_ref() diff --git a/framework/scenario/src/standalone/account_tool.rs b/framework/scenario/src/standalone/account_tool.rs index 877e75fc18..c1f4c5f605 100644 --- a/framework/scenario/src/standalone/account_tool.rs +++ b/framework/scenario/src/standalone/account_tool.rs @@ -57,6 +57,7 @@ pub async fn retrieve_account_as_scenario_set_state( storage: convert_storage(account_storage), comment: None, code: retrieve_code(account.code), + code_metadata: None, // TODO: retrieve code metadata owner: None, developer_rewards: None, }, diff --git a/framework/scenario/src/whitebox_legacy/raw_converter.rs b/framework/scenario/src/whitebox_legacy/raw_converter.rs index 503f55be97..1fc2bd332c 100644 --- a/framework/scenario/src/whitebox_legacy/raw_converter.rs +++ b/framework/scenario/src/whitebox_legacy/raw_converter.rs @@ -47,10 +47,11 @@ pub(crate) fn account_as_raw(acc: &AccountData) -> AccountRaw { AccountRaw { balance: balance_raw, - code: code_raw, comment: None, esdt: all_esdt_raw, nonce: Some(u64_as_raw(acc.nonce)), + code: code_raw, + code_metadata: Some(bytes_as_raw(acc.code_metadata.to_vec())), owner: acc.contract_owner.as_ref().map(vm_address_as_raw), storage: storage_raw, username: None, // TODO: Add if needed @@ -244,6 +245,7 @@ pub(crate) fn account_as_check_state_raw(acc: &AccountData) -> CheckAccountsRaw developer_rewards: CheckBytesValueRaw::Equal(rust_biguint_as_raw(&acc.developer_rewards)), storage: CheckStorageRaw::Equal(check_storage_raw), code: CheckBytesValueRaw::Star, + code_metadata: CheckBytesValueRaw::Star, async_call_data: CheckBytesValueRaw::Unspecified, comment: None, username: CheckBytesValueRaw::Unspecified, @@ -304,10 +306,16 @@ pub(crate) fn u64_as_raw_opt(value: u64) -> Option { U64Value::from(value).into_raw_opt() } -pub(crate) fn bytes_as_raw(bytes: &[u8]) -> ValueSubTree { +pub(crate) fn bytes_as_raw(bytes: B) -> ValueSubTree +where + B: AsRef<[u8]>, +{ ValueSubTree::Str(bytes_to_hex(bytes)) } -pub(crate) fn bytes_to_hex(bytes: &[u8]) -> String { +pub(crate) fn bytes_to_hex(bytes: B) -> String +where + B: AsRef<[u8]>, +{ format!("0x{}", hex::encode(bytes)) } diff --git a/framework/scenario/tests/scenarios-self/set-check/set-check-codemetadata.err.json b/framework/scenario/tests/scenarios-self/set-check/set-check-codemetadata.err.json new file mode 100644 index 0000000000..f1587f9844 --- /dev/null +++ b/framework/scenario/tests/scenarios-self/set-check/set-check-codemetadata.err.json @@ -0,0 +1,24 @@ +{ + "comment": "verifies that setState and checkState are consistent", + "steps": [ + { + "step": "setState", + "accounts": { + "sc:contract-address": { + "code": "file:set-check-esdt.scen.json", + "codeMetadata": "0x0101" + } + } + }, + { + "step": "checkState", + "id": "check-1", + "accounts": { + "sc:contract-address": { + "code": "*", + "codeMetadata": "0x0000" + } + } + } + ] +} diff --git a/framework/scenario/tests/scenarios-self/set-check/set-check-codemetadata.scen.json b/framework/scenario/tests/scenarios-self/set-check/set-check-codemetadata.scen.json new file mode 100644 index 0000000000..3111b01d9e --- /dev/null +++ b/framework/scenario/tests/scenarios-self/set-check/set-check-codemetadata.scen.json @@ -0,0 +1,52 @@ +{ + "comment": "verifies that setState and checkState are consistent", + "steps": [ + { + "step": "setState", + "accounts": { + "sc:contract-address": { + "code": "file:set-check-esdt.scen.json" + } + } + }, + { + "step": "checkState", + "id": "check-default", + "accounts": { + "sc:contract-address": { + "code": "*", + "codeMetadata": "0x0506" + } + } + }, + { + "step": "setState", + "accounts": { + "sc:contract-address": { + "code": "file:set-check-esdt.scen.json", + "codeMetadata": "0x0102" + } + } + }, + { + "step": "checkState", + "id": "check-1", + "accounts": { + "sc:contract-address": { + "code": "*", + "codeMetadata": "0x0102" + } + } + }, + { + "step": "checkState", + "id": "check-2", + "accounts": { + "sc:contract-address": { + "code": "*", + "codeMetadata": "*" + } + } + } + ] +} diff --git a/framework/scenario/tests/scenarios_self_test.rs b/framework/scenario/tests/scenarios_self_test.rs index 9c07db430d..df3c6e310e 100644 --- a/framework/scenario/tests/scenarios_self_test.rs +++ b/framework/scenario/tests/scenarios_self_test.rs @@ -66,6 +66,17 @@ fn set_check_code() { world().run("tests/scenarios-self/set-check/set-check-code.scen.json"); } +#[test] +#[should_panic] +fn set_check_codemetadata_err_rs() { + world().run("tests/scenarios-self/set-check/set-check-codemetadata.err.json"); +} + +#[test] +fn set_check_codemetadata() { + world().run("tests/scenarios-self/set-check/set-check-codemetadata.scen.json"); +} + #[test] #[should_panic] fn set_check_esdt_err_rs() { diff --git a/sdk/scenario-format/src/serde_raw/account_data_raw/account_raw.rs b/sdk/scenario-format/src/serde_raw/account_data_raw/account_raw.rs index d9ee01c93d..2d0fced91b 100644 --- a/sdk/scenario-format/src/serde_raw/account_data_raw/account_raw.rs +++ b/sdk/scenario-format/src/serde_raw/account_data_raw/account_raw.rs @@ -34,6 +34,10 @@ pub struct AccountRaw { #[serde(skip_serializing_if = "Option::is_none")] pub code: Option, + #[serde(default)] + #[serde(skip_serializing_if = "Option::is_none")] + pub code_metadata: Option, + #[serde(default)] #[serde(skip_serializing_if = "Option::is_none")] pub owner: Option, diff --git a/sdk/scenario-format/src/serde_raw/account_data_raw/account_raw_check.rs b/sdk/scenario-format/src/serde_raw/account_data_raw/account_raw_check.rs index 12ba7952d3..50a87fee96 100644 --- a/sdk/scenario-format/src/serde_raw/account_data_raw/account_raw_check.rs +++ b/sdk/scenario-format/src/serde_raw/account_data_raw/account_raw_check.rs @@ -32,6 +32,10 @@ pub struct CheckAccountRaw { #[serde(skip_serializing_if = "CheckBytesValueRaw::is_unspecified")] pub code: CheckBytesValueRaw, + #[serde(default)] + #[serde(skip_serializing_if = "CheckBytesValueRaw::is_unspecified")] + pub code_metadata: CheckBytesValueRaw, + #[serde(default)] #[serde(skip_serializing_if = "CheckBytesValueRaw::is_unspecified")] pub owner: CheckBytesValueRaw, diff --git a/vm/src/tx_execution/builtin_function_mocks/general/upgrade_contract.rs b/vm/src/tx_execution/builtin_function_mocks/general/upgrade_contract.rs index 471c62455d..7de2032273 100644 --- a/vm/src/tx_execution/builtin_function_mocks/general/upgrade_contract.rs +++ b/vm/src/tx_execution/builtin_function_mocks/general/upgrade_contract.rs @@ -2,7 +2,10 @@ use crate::tx_execution::{ builtin_function_names::UPGRADE_CONTRACT_FUNC_NAME, create_transfer_value_log, BlockchainVMRef, }; -use crate::tx_mock::{BlockchainUpdate, CallType, TxCache, TxFunctionName, TxInput, TxResult}; +use crate::{ + tx_mock::{BlockchainUpdate, CallType, TxCache, TxFunctionName, TxInput, TxResult}, + types::VMCodeMetadata, +}; use super::super::builtin_func_trait::BuiltinFunction; @@ -31,9 +34,7 @@ impl BuiltinFunction for UpgradeContract { } let new_code = tx_input.args[0].clone(); - - // tx_input.args[1] is the code metadata, we ignore for now - // TODO: model code metadata in Mandos + let code_metadata = VMCodeMetadata::from(&tx_input.args[1]); let args = if tx_input.args.len() > 2 { tx_input.args[2..].to_vec() @@ -43,6 +44,7 @@ impl BuiltinFunction for UpgradeContract { tx_cache.with_account_mut(&tx_input.to, |account| { account.contract_path = Some(new_code); + account.code_metadata = code_metadata; }); let transfer_value_log = create_transfer_value_log(&tx_input, CallType::UpgradeFromSource); diff --git a/vm/src/tx_execution/exec_call.rs b/vm/src/tx_execution/exec_call.rs index 6e69b7d9e0..c121146f49 100644 --- a/vm/src/tx_execution/exec_call.rs +++ b/vm/src/tx_execution/exec_call.rs @@ -3,9 +3,7 @@ use crate::{ async_call_tx_input, async_callback_tx_input, async_promise_callback_tx_input, merge_results, AsyncCallTxData, BlockchainUpdate, CallType, Promise, TxCache, TxContext, TxContextStack, TxInput, TxPanic, TxResult, TxResultCalls, - }, - with_shared::Shareable, - world_mock::{AccountData, AccountEsdt, BlockchainState}, + }, types::VMCodeMetadata, with_shared::Shareable, world_mock::{AccountData, AccountEsdt, BlockchainState} }; use num_bigint::BigUint; use num_traits::Zero; @@ -242,6 +240,7 @@ impl BlockchainVMRef { username: Vec::new(), storage: HashMap::new(), contract_path: None, + code_metadata: VMCodeMetadata::empty(), contract_owner: None, developer_rewards: BigUint::zero(), }); diff --git a/vm/src/tx_execution/exec_create.rs b/vm/src/tx_execution/exec_create.rs index 9755c6211c..a67ef61056 100644 --- a/vm/src/tx_execution/exec_create.rs +++ b/vm/src/tx_execution/exec_create.rs @@ -1,6 +1,6 @@ use crate::{ tx_mock::{TxCache, TxInput, TxResult}, - types::VMAddress, + types::{VMAddress, VMCodeMetadata}, with_shared::Shareable, world_mock::BlockchainState, }; @@ -12,6 +12,7 @@ impl BlockchainVMRef { &self, tx_input: TxInput, contract_path: &[u8], + code_metadata: VMCodeMetadata, state: &mut Shareable, f: F, ) -> (VMAddress, TxResult) @@ -26,7 +27,7 @@ impl BlockchainVMRef { let (tx_result, new_address, blockchain_updates) = state.with_shared(|state_arc| { let tx_cache = TxCache::new(state_arc); - self.deploy_contract(tx_input, contract_path.to_vec(), tx_cache, f) + self.deploy_contract(tx_input, contract_path.to_vec(), code_metadata, tx_cache, f) }); blockchain_updates.apply(state); diff --git a/vm/src/tx_execution/exec_general_tx.rs b/vm/src/tx_execution/exec_general_tx.rs index 748b059db9..2100e3fb20 100644 --- a/vm/src/tx_execution/exec_general_tx.rs +++ b/vm/src/tx_execution/exec_general_tx.rs @@ -6,7 +6,7 @@ use crate::{ BlockchainUpdate, CallType, TxCache, TxContext, TxContextStack, TxFunctionName, TxInput, TxLog, TxResult, }, - types::{top_encode_big_uint, VMAddress}, + types::{top_encode_big_uint, VMAddress, VMCodeMetadata}, with_shared::Shareable, }; @@ -128,6 +128,7 @@ impl BlockchainVMRef { &self, mut tx_input: TxInput, contract_path: Vec, + code_metadata: VMCodeMetadata, tx_cache: TxCache, f: F, ) -> (TxResult, VMAddress, BlockchainUpdate) @@ -151,7 +152,12 @@ impl BlockchainVMRef { BlockchainUpdate::empty(), ); } - tx_context_sh.create_new_contract(&new_address, contract_path, tx_input_ref.from.clone()); + tx_context_sh.create_new_contract( + &new_address, + contract_path, + code_metadata, + tx_input_ref.from.clone(), + ); tx_context_sh .tx_cache .increase_egld_balance(&new_address, &tx_input_ref.egld_value); diff --git a/vm/src/tx_mock/tx_context.rs b/vm/src/tx_mock/tx_context.rs index dd7db4b2f0..fca9d58363 100644 --- a/vm/src/tx_mock/tx_context.rs +++ b/vm/src/tx_mock/tx_context.rs @@ -1,6 +1,6 @@ use crate::{ tx_execution::BlockchainVMRef, - types::VMAddress, + types::{VMAddress, VMCodeMetadata}, world_mock::{AccountData, AccountEsdt, BlockchainState, FailingExecutor}, }; use num_bigint::BigUint; @@ -49,6 +49,7 @@ impl TxContext { esdt: AccountEsdt::default(), username: Vec::new(), contract_path: None, + code_metadata: VMCodeMetadata::empty(), contract_owner: None, developer_rewards: BigUint::zero(), }); @@ -148,6 +149,7 @@ impl TxContext { &self, new_address: &VMAddress, contract_path: Vec, + code_metadata: VMCodeMetadata, contract_owner: VMAddress, ) { assert!( @@ -163,6 +165,7 @@ impl TxContext { esdt: AccountEsdt::default(), username: Vec::new(), contract_path: Some(contract_path), + code_metadata, contract_owner: Some(contract_owner), developer_rewards: BigUint::zero(), }); diff --git a/vm/src/types/vm_code_metadata.rs b/vm/src/types/vm_code_metadata.rs index 207d523c37..5073d9ffe1 100644 --- a/vm/src/types/vm_code_metadata.rs +++ b/vm/src/types/vm_code_metadata.rs @@ -40,12 +40,24 @@ impl VMCodeMetadata { } impl From<[u8; 2]> for VMCodeMetadata { - #[inline] fn from(arr: [u8; 2]) -> Self { VMCodeMetadata::from(u16::from_be_bytes(arr)) } } +impl From<&[u8]> for VMCodeMetadata { + fn from(slice: &[u8]) -> Self { + let arr: [u8; 2] = slice.try_into().unwrap_or_default(); + VMCodeMetadata::from(arr) + } +} + +impl From<&Vec> for VMCodeMetadata { + fn from(v: &Vec) -> Self { + VMCodeMetadata::from(v.as_slice()) + } +} + impl From for VMCodeMetadata { #[inline] fn from(value: u16) -> Self { diff --git a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs b/vm/src/vm_hooks/vh_impl/vh_debug_api.rs index 6596842838..618788d966 100644 --- a/vm/src/vm_hooks/vh_impl/vh_debug_api.rs +++ b/vm/src/vm_hooks/vh_impl/vh_debug_api.rs @@ -139,7 +139,7 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler { &self, egld_value: num_bigint::BigUint, contract_code: Vec, - _code_metadata: VMCodeMetadata, + code_metadata: VMCodeMetadata, args: Vec>, ) -> (VMAddress, Vec>) { let contract_address = self.current_address(); @@ -162,6 +162,7 @@ impl VMHooksHandlerSource for DebugApiVMHooksHandler { let (tx_result, new_address, blockchain_updates) = self.0.vm_ref.deploy_contract( tx_input, contract_code, + code_metadata, tx_cache, execute_current_tx_context_input, ); diff --git a/vm/src/world_mock/account_data.rs b/vm/src/world_mock/account_data.rs index e7f5b9330b..343c49bb8d 100644 --- a/vm/src/world_mock/account_data.rs +++ b/vm/src/world_mock/account_data.rs @@ -2,7 +2,10 @@ use num_bigint::BigUint; use num_traits::Zero; use super::AccountEsdt; -use crate::{display_util::key_hex, types::VMAddress}; +use crate::{ + display_util::key_hex, + types::{VMAddress, VMCodeMetadata}, +}; use std::{collections::HashMap, fmt, fmt::Write}; pub type AccountStorage = HashMap, Vec>; @@ -16,6 +19,7 @@ pub struct AccountData { pub storage: AccountStorage, pub username: Vec, pub contract_path: Option>, + pub code_metadata: VMCodeMetadata, pub contract_owner: Option, pub developer_rewards: BigUint, } @@ -30,6 +34,7 @@ impl AccountData { storage: AccountStorage::default(), username: vec![], contract_path: None, + code_metadata: VMCodeMetadata::empty(), contract_owner: None, developer_rewards: BigUint::zero(), } From 13cd718b128d87c7665f7223b11a354aa42add30 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Thu, 18 Jan 2024 10:02:48 +0200 Subject: [PATCH 38/84] clippy fix --- framework/scenario/src/whitebox_legacy/raw_converter.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/scenario/src/whitebox_legacy/raw_converter.rs b/framework/scenario/src/whitebox_legacy/raw_converter.rs index 1fc2bd332c..2b390e98ba 100644 --- a/framework/scenario/src/whitebox_legacy/raw_converter.rs +++ b/framework/scenario/src/whitebox_legacy/raw_converter.rs @@ -78,10 +78,10 @@ pub(crate) fn esdt_data_as_raw(esdt: &EsdtData) -> EsdtRaw { attributes: Some(bytes_as_raw(&inst.metadata.attributes)), balance: Some(rust_biguint_as_raw(&inst.balance)), creator: inst.metadata.creator.as_ref().map(vm_address_as_raw), - hash: inst.metadata.hash.as_ref().map(|h| bytes_as_raw(h)), + hash: inst.metadata.hash.as_ref().map(bytes_as_raw), nonce: Some(u64_as_raw(inst.nonce)), royalties: Some(u64_as_raw(inst.metadata.royalties)), - uri: inst.metadata.uri.iter().map(|u| bytes_as_raw(u)).collect(), + uri: inst.metadata.uri.iter().map(bytes_as_raw).collect(), }; instances_raw.push(inst_raw); From e64336b422f2b5efc0e26866d0dfaff372036b93 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Thu, 18 Jan 2024 12:42:02 +0200 Subject: [PATCH 39/84] multisig test code metadata fix --- .../examples/multisig/scenarios/deployAdder_err.scen.json | 2 +- .../multisig/scenarios/deployAdder_then_call.scen.json | 4 ++-- .../examples/multisig/scenarios/deployFactorial.scen.json | 4 ++-- .../examples/multisig/scenarios/deployOtherMultisig.scen.json | 2 +- contracts/examples/multisig/scenarios/upgrade.scen.json | 2 +- .../examples/multisig/scenarios/upgrade_from_source.scen.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contracts/examples/multisig/scenarios/deployAdder_err.scen.json b/contracts/examples/multisig/scenarios/deployAdder_err.scen.json index b0403cac7e..128b6ebb02 100644 --- a/contracts/examples/multisig/scenarios/deployAdder_err.scen.json +++ b/contracts/examples/multisig/scenarios/deployAdder_err.scen.json @@ -27,7 +27,7 @@ "arguments": [ "0", "sc:adder-code", - "0x0000" + "0x0100" ], "gasLimit": "200,000,000", "gasPrice": "0" diff --git a/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json b/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json index 8b5d118e62..37d5af5975 100644 --- a/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json +++ b/contracts/examples/multisig/scenarios/deployAdder_then_call.scen.json @@ -26,7 +26,7 @@ "arguments": [ "0", "sc:adder-code", - "0x0000", + "0x0100", "1234" ], "gasLimit": "200,000,000", @@ -73,7 +73,7 @@ "1-discriminant": "0x07", "2-amount": "u32:0", "3-code_source": "sc:adder-code", - "4-code_metadata": "0x0000", + "4-code_metadata": "0x0100", "5-arguments": [ "u32:1", "u32:2|1234" diff --git a/contracts/examples/multisig/scenarios/deployFactorial.scen.json b/contracts/examples/multisig/scenarios/deployFactorial.scen.json index 96bda0545f..416070acc5 100644 --- a/contracts/examples/multisig/scenarios/deployFactorial.scen.json +++ b/contracts/examples/multisig/scenarios/deployFactorial.scen.json @@ -26,7 +26,7 @@ "arguments": [ "0", "sc:factorial-code", - "0x0000" + "0x0100" ], "gasLimit": "200,000,000", "gasPrice": "0" @@ -72,7 +72,7 @@ "1-discriminant": "0x07", "2-amount": "u32:0", "3-code_source": "sc:factorial-code", - "4-code_metadata": "0x0000", + "4-code_metadata": "0x0100", "5-arguments": "u32:0" } }, diff --git a/contracts/examples/multisig/scenarios/deployOtherMultisig.scen.json b/contracts/examples/multisig/scenarios/deployOtherMultisig.scen.json index a180dd0ce5..baf0da3fc2 100644 --- a/contracts/examples/multisig/scenarios/deployOtherMultisig.scen.json +++ b/contracts/examples/multisig/scenarios/deployOtherMultisig.scen.json @@ -26,7 +26,7 @@ "arguments": [ "0", "sc:multisig", - "0x0000", + "0x0100", "1", "address:paul" ], diff --git a/contracts/examples/multisig/scenarios/upgrade.scen.json b/contracts/examples/multisig/scenarios/upgrade.scen.json index 89efaae490..6f1b75b56b 100644 --- a/contracts/examples/multisig/scenarios/upgrade.scen.json +++ b/contracts/examples/multisig/scenarios/upgrade.scen.json @@ -16,7 +16,7 @@ "sc:multisig-child", "0", "sc:adder-code", - "0x0000", + "0x0100", "1234" ], "gasLimit": "15,000,000", diff --git a/contracts/examples/multisig/scenarios/upgrade_from_source.scen.json b/contracts/examples/multisig/scenarios/upgrade_from_source.scen.json index f8d1d7a942..0224d22f56 100644 --- a/contracts/examples/multisig/scenarios/upgrade_from_source.scen.json +++ b/contracts/examples/multisig/scenarios/upgrade_from_source.scen.json @@ -16,7 +16,7 @@ "sc:multisig-child", "0", "sc:multisig", - "0x0000", + "0x0100", "1", "address:alice" ], From 27056ea77141b924cf436609f1037ce6dbcca082 Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Thu, 18 Jan 2024 12:44:13 +0100 Subject: [PATCH 40/84] impl for no-capture arg for sc-meta test cli --- .../meta/src/cli_args/cli_args_standalone.rs | 5 +++++ framework/meta/src/cmd/standalone/test.rs | 15 ++++++++++++--- .../scenario/model/transaction/tx_response.rs | 18 +++++++++++------- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs index 51b678c3ec..cbe0dbe22f 100644 --- a/framework/meta/src/cli_args/cli_args_standalone.rs +++ b/framework/meta/src/cli_args/cli_args_standalone.rs @@ -95,6 +95,11 @@ pub struct TestArgs { /// If scen and go are both specified, scen overrides the go argument. #[arg(short, long, default_value = "false", verbatim_doc_comment)] pub scen: bool, + + /// This arg prints all the output from the vm + /// Default value will be "false" if not specified + #[arg(short, long, default_value = "false", verbatim_doc_comment)] + pub nc: bool, } #[derive(Default, Clone, PartialEq, Eq, Debug, Args)] diff --git a/framework/meta/src/cmd/standalone/test.rs b/framework/meta/src/cmd/standalone/test.rs index a66f46c391..da81e23502 100644 --- a/framework/meta/src/cmd/standalone/test.rs +++ b/framework/meta/src/cmd/standalone/test.rs @@ -11,6 +11,7 @@ pub fn test(test_args: &TestArgs) { let go = test_args.go; let scen = test_args.scen; + let no_capture = if test_args.nc { "-- --nocapture" } else { "" }; if scen { program = "run-scenarios"; @@ -20,9 +21,14 @@ pub fn test(test_args: &TestArgs) { println!("{}", "If scen parameter is true, it will override the go parameter. Executing scenarios...".yellow()); } } else if go { - args.extend(["test", "--features", "multiversx-sc-scenario/run-go-tests"]); + args.extend([ + "test", + no_capture, + "--features", + "multiversx-sc-scenario/run-go-tests", + ]); } else { - args.extend(["test"]); + args.extend(["test", no_capture]); } let args_str = args.join(" "); @@ -44,6 +50,9 @@ pub fn test(test_args: &TestArgs) { ) }); + println!("args are {}", args_str); + println!("program is {}", program); + println!("Process finished with: {status}"); - assert!(status.success()); + // assert!(status.success()); } diff --git a/framework/scenario/src/scenario/model/transaction/tx_response.rs b/framework/scenario/src/scenario/model/transaction/tx_response.rs index 1f34d6c12e..f73641c9c9 100644 --- a/framework/scenario/src/scenario/model/transaction/tx_response.rs +++ b/framework/scenario/src/scenario/model/transaction/tx_response.rs @@ -175,11 +175,11 @@ impl TxResponse { fn process_new_issued_token_identifier(mut self) -> Self { for scr in self.api_scrs.iter() { if scr.sender.to_string() != SYSTEM_SC_BECH32 { - continue + continue; } let Some(prev_tx) = self.api_scrs.iter().find(|e| e.hash == scr.prev_tx_hash) else { - continue + continue; }; let is_issue_fungible = prev_tx.data.starts_with("issue@"); @@ -187,7 +187,11 @@ impl TxResponse { let is_issue_non_fungible = prev_tx.data.starts_with("issueNonFungible@"); let is_register_meta_esdt = prev_tx.data.starts_with("registerMetaESDT@"); - if !is_issue_fungible && !is_issue_semi_fungible && !is_issue_non_fungible && !is_register_meta_esdt { + if !is_issue_fungible + && !is_issue_semi_fungible + && !is_issue_non_fungible + && !is_register_meta_esdt + { continue; } @@ -197,7 +201,8 @@ impl TxResponse { return self; } - self.new_issued_token_identifier = Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap()); + self.new_issued_token_identifier = + Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap()); break; } else if scr.data.starts_with("@00@") { @@ -206,7 +211,8 @@ impl TxResponse { return self; } - self.new_issued_token_identifier = Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap()); + self.new_issued_token_identifier = + Some(String::from_utf8(hex::decode(encoded_tid.unwrap()).unwrap()).unwrap()); break; } @@ -1261,7 +1267,6 @@ mod tests { let expected: Option = Some("EGLDMEX-95c6d5".to_string()); assert_eq!(tx_response.new_issued_token_identifier, expected) - } #[test] @@ -1978,7 +1983,6 @@ mod tests { let expected: Option = Some("AVASH-7d8b5d".to_string()); assert_eq!(tx_response.new_issued_token_identifier, expected) - } #[test] From b8bbc3024b1dfd81427ec77958a0d2bda255c16a Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Thu, 18 Jan 2024 15:30:15 +0100 Subject: [PATCH 41/84] command fix --- .../scenarios/stress_submit_test.scen.json | 718 +++++++----------- framework/meta/src/cmd/standalone/test.rs | 24 +- 2 files changed, 268 insertions(+), 474 deletions(-) diff --git a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json index e1eec1cc6a..c0ff47a3cf 100644 --- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json +++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json @@ -281,13 +281,11 @@ "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f", "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f" ], - "gasLimit": "120,000,000", - "gasPrice": "" + "gasLimit": "120,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -299,13 +297,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -317,13 +313,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -335,13 +329,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -353,13 +345,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -371,13 +361,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -389,13 +377,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -407,13 +393,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -425,13 +409,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -443,13 +425,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -461,13 +441,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -479,13 +457,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -497,13 +473,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -515,13 +489,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -533,13 +505,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -551,13 +521,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -569,13 +537,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -587,13 +553,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -605,13 +569,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -623,13 +585,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -641,13 +601,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -659,13 +617,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -677,13 +633,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -695,13 +649,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -713,13 +665,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -731,13 +681,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -749,13 +697,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -767,13 +713,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -785,13 +729,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -803,13 +745,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -821,13 +761,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -839,13 +777,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -857,13 +793,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -875,13 +809,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -893,13 +825,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -911,13 +841,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -929,13 +857,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -947,13 +873,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -965,13 +889,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -983,13 +905,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1001,13 +921,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1019,13 +937,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1037,13 +953,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1055,13 +969,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1073,13 +985,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1091,13 +1001,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1109,13 +1017,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1127,13 +1033,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1145,13 +1049,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1163,13 +1065,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1181,13 +1081,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1202,13 +1100,11 @@ "0x55534443", "0x" ], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1219,13 +1115,11 @@ "to": "sc:price-aggregator", "function": "unpause", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1239,16 +1133,14 @@ "0x45474c44", "0x55534443", "0x5f", - "0x619911dbb570258c", + "0xea70ca9a91d18271", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1262,16 +1154,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x3cf8d3d3a05bf655", + "0xce1d764d9bfb7854", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1285,16 +1175,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x4d92440172e0bf71", + "0x5c2737add325116f", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1308,16 +1196,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xd971ed41066daa08", + "0xe27e5dc612456364", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1331,16 +1217,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x34a9348cb04afbd1", + "0x9c58bc1f626cb6a3", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1354,16 +1238,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x6c01a77d55c0861f", + "0x9068f4446fd2ae04", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1377,16 +1259,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xea1e93f2b82ec0f6", + "0xff5cf23c81ef3917", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1400,16 +1280,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x2f067fee00bbd5bc", + "0xe7c12838b9771f0d", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1423,16 +1301,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x1706fe5397a21f74", + "0x7951c85c7aada436", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1446,16 +1322,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xbffd5631e9e448a8", + "0x6c0190eb13a194be", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1469,16 +1343,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x1940496d3bc8934c", + "0x14a496f92926e9b5", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1492,16 +1364,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xbd0af0d3aba30235", + "0x7a3fdaa619bbff3b", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1515,16 +1385,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xebcf9494ec0fac0c", + "0x8ba32f535a83c19f", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1538,16 +1406,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x7aeb67c3eabe498c", + "0xb4dcd2ddffcf59cc", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1561,16 +1427,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x5c758d17b8445f7f", + "0x6d97d7d437f7391c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1584,16 +1448,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x6978fe48b9a58974", + "0x653f1b1655683896", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1607,16 +1469,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x8692c26f665bc7ad", + "0xda4062ae7c6184a1", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1630,16 +1490,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x2d3a93b7522e72b6", + "0x065464cf4c6ea105", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1653,16 +1511,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x4faa49415e935688", + "0x0cb9821748ad956c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1676,16 +1532,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x5cbca2cc253dbf54", + "0x1b827e1858a67166", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1699,16 +1553,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xdd20d194dd695735", + "0x1bd9792d3edc64ff", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1722,16 +1574,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x32f039c1765a2ec3", + "0x3599d17cbfb5c4ee", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1745,16 +1595,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x84372c9de3d535d9", + "0xc65e751b22607656", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1768,16 +1616,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x91b23ed59de93417", + "0xd4bbccef7ef3e7b4", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1791,16 +1637,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x4b81d1a55887f5f9", + "0xfb37857d5530fcd0", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1814,16 +1658,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xd88e348ef6679e1d", + "0x8df934cb90b71e8a", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1837,16 +1679,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x2557834dc8059cc7", + "0x797dda97a2b25e35", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1860,16 +1700,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x22d86f8317546033", + "0x5b254f2fbb741680", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1883,16 +1721,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x5a775ddd32ca5367", + "0x08b9538d10e65320", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1906,16 +1742,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x59f049471cd2662c", + "0x239d2e995b7a4894", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1929,16 +1763,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xb59fdc2aedbf845f", + "0x7e79b8e4112cf678", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1952,16 +1784,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xab13e96eb802f883", + "0xb09b8311215bab5e", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1975,16 +1805,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xf6f152ab53ad7170", + "0x0ec08ba689cbc952", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1998,16 +1826,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x5bae78b87d516979", + "0xacc5e6e196c8f3a2", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2021,16 +1847,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xe47859cc0fdb0abe", + "0xc64fdfa560909ccf", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2044,16 +1868,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x7c36ab1fa1a348b4", + "0x2c2ae119256b5aae", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2067,16 +1889,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x7fda3ef39b74e04b", + "0xa6ffbeb92ecd79d7", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2090,16 +1910,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x461d81a84db50115", + "0xe5c75596603ce92b", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2113,16 +1931,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xcc0ab8ccc363dd0c", + "0x32c7a5176f9318d0", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2136,16 +1952,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x11c15058c7c6c1fa", + "0xd58a0c76a0d1118f", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2159,16 +1973,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x293b700535555d4f", + "0xc9e3b2f21e05a287", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2182,16 +1994,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x4e8d04d2f0e53efd", + "0xb88a7a86d1836794", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2205,16 +2015,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x42be3651d7b9499e", + "0x12deed12306ff1fb", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2228,16 +2036,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xb82a437fc87cd8a0", + "0xeba9e8ef75b11054", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2251,16 +2057,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xb12ebd0d9ff3f396", + "0x97644d8258f30691", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2274,16 +2078,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x85b4d01e5a20d445", + "0xfcc9924787c5bc88", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2297,16 +2099,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x92edaca582002375", + "0x661199b6b7871218", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2320,16 +2120,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x351151b47fee6331", + "0x21792a541d619b73", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2343,16 +2141,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x9155d2992ceb6beb", + "0x3667892bd8fa2283", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2366,16 +2162,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xdbc0895ce5855dec", + "0xbaf637c9be0e4875", "0x" ], - "gasLimit": "50,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } } ] diff --git a/framework/meta/src/cmd/standalone/test.rs b/framework/meta/src/cmd/standalone/test.rs index da81e23502..b3b9b3ceb6 100644 --- a/framework/meta/src/cmd/standalone/test.rs +++ b/framework/meta/src/cmd/standalone/test.rs @@ -11,7 +11,7 @@ pub fn test(test_args: &TestArgs) { let go = test_args.go; let scen = test_args.scen; - let no_capture = if test_args.nc { "-- --nocapture" } else { "" }; + let no_capture = test_args.nc; if scen { program = "run-scenarios"; @@ -21,14 +21,17 @@ pub fn test(test_args: &TestArgs) { println!("{}", "If scen parameter is true, it will override the go parameter. Executing scenarios...".yellow()); } } else if go { - args.extend([ - "test", - no_capture, - "--features", - "multiversx-sc-scenario/run-go-tests", - ]); + args.extend(["test", "--features", "multiversx-sc-scenario/run-go-tests"]); + + if no_capture { + args.extend(["--", "--nocapture"]) + } } else { - args.extend(["test", no_capture]); + args.extend(["test"]); + + if no_capture { + args.extend(["--", "--nocapture"]) + } } let args_str = args.join(" "); @@ -50,9 +53,6 @@ pub fn test(test_args: &TestArgs) { ) }); - println!("args are {}", args_str); - println!("program is {}", program); - println!("Process finished with: {status}"); - // assert!(status.success()); + assert!(status.success()); } From cdf7190e9be316d3156d5680f188abcb789eed0b Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Thu, 18 Jan 2024 16:20:10 +0100 Subject: [PATCH 42/84] reorg, rename and fmt --- .../meta/src/cli_args/cli_args_standalone.rs | 4 ++-- framework/meta/src/cmd/standalone/test.rs | 16 +++++++--------- vm/src/tx_execution/exec_call.rs | 5 ++++- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs index cbe0dbe22f..7d0e9875f0 100644 --- a/framework/meta/src/cli_args/cli_args_standalone.rs +++ b/framework/meta/src/cli_args/cli_args_standalone.rs @@ -96,10 +96,10 @@ pub struct TestArgs { #[arg(short, long, default_value = "false", verbatim_doc_comment)] pub scen: bool, - /// This arg prints all the output from the vm + /// This arg prints the entire output of the vm. /// Default value will be "false" if not specified #[arg(short, long, default_value = "false", verbatim_doc_comment)] - pub nc: bool, + pub nocapture: bool, } #[derive(Default, Clone, PartialEq, Eq, Debug, Args)] diff --git a/framework/meta/src/cmd/standalone/test.rs b/framework/meta/src/cmd/standalone/test.rs index b3b9b3ceb6..33d3a38d24 100644 --- a/framework/meta/src/cmd/standalone/test.rs +++ b/framework/meta/src/cmd/standalone/test.rs @@ -11,26 +11,24 @@ pub fn test(test_args: &TestArgs) { let go = test_args.go; let scen = test_args.scen; - let no_capture = test_args.nc; + let no_capture = test_args.nocapture; if scen { program = "run-scenarios"; - args.extend(["./"]); + args.push("./"); if go { println!("{}", "If scen parameter is true, it will override the go parameter. Executing scenarios...".yellow()); } - } else if go { - args.extend(["test", "--features", "multiversx-sc-scenario/run-go-tests"]); + } else { + args.push("test"); - if no_capture { - args.extend(["--", "--nocapture"]) + if go { + args.extend(["--features", "multiversx-sc-scenario/run-go-tests"]); } - } else { - args.extend(["test"]); if no_capture { - args.extend(["--", "--nocapture"]) + args.extend(["--", "--nocapture"]); } } diff --git a/vm/src/tx_execution/exec_call.rs b/vm/src/tx_execution/exec_call.rs index c121146f49..ffc48e12ae 100644 --- a/vm/src/tx_execution/exec_call.rs +++ b/vm/src/tx_execution/exec_call.rs @@ -3,7 +3,10 @@ use crate::{ async_call_tx_input, async_callback_tx_input, async_promise_callback_tx_input, merge_results, AsyncCallTxData, BlockchainUpdate, CallType, Promise, TxCache, TxContext, TxContextStack, TxInput, TxPanic, TxResult, TxResultCalls, - }, types::VMCodeMetadata, with_shared::Shareable, world_mock::{AccountData, AccountEsdt, BlockchainState} + }, + types::VMCodeMetadata, + with_shared::Shareable, + world_mock::{AccountData, AccountEsdt, BlockchainState}, }; use num_bigint::BigUint; use num_traits::Zero; From 6e46980f4fcdea3390761d5ecc27b13d6f284cff Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 19 Jan 2024 12:02:13 +0200 Subject: [PATCH 43/84] install scenario go - prototype --- .../meta/src/cli_args/cli_args_standalone.rs | 16 ++ framework/meta/src/cmd/standalone.rs | 3 + framework/meta/src/cmd/standalone/install.rs | 9 + .../standalone/install/install_scenario_go.rs | 168 ++++++++++++++++++ framework/meta/src/print_util.rs | 28 +-- 5 files changed, 210 insertions(+), 14 deletions(-) create mode 100644 framework/meta/src/cmd/standalone/install.rs create mode 100644 framework/meta/src/cmd/standalone/install/install_scenario_go.rs diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs index 51b678c3ec..312117f9db 100644 --- a/framework/meta/src/cli_args/cli_args_standalone.rs +++ b/framework/meta/src/cli_args/cli_args_standalone.rs @@ -56,13 +56,18 @@ pub enum StandaloneCliAction { #[command(name = "templates", about = "Lists all pre-existing templates")] TemplateList(TemplateListArgs), + #[command( name = "test-gen", about = "Generates Rust integration tests based on scenarios provided in the scenarios folder of each contract." )] TestGen(TestGenArgs), + #[command(name = "test", about = "Runs cargo test")] Test(TestArgs), + + #[command(name = "install", about = "Installs framework dependencies")] + Install(InstallArgs), } #[derive(Default, Clone, PartialEq, Eq, Debug, Args)] @@ -254,3 +259,14 @@ pub struct TestGenArgs { #[arg(long, verbatim_doc_comment)] pub create: bool, } + +#[derive(Default, Clone, PartialEq, Eq, Debug, Args)] +pub struct InstallArgs { + /// Install the `multiversx-scenario-go-cli`. + #[arg(short = 'g', long, verbatim_doc_comment)] + pub scenario_go: bool, + + /// The framework version on which the contracts should be created. + #[arg(long, verbatim_doc_comment)] + pub tag: Option, +} diff --git a/framework/meta/src/cmd/standalone.rs b/framework/meta/src/cmd/standalone.rs index c675fb601e..ddc8cef085 100644 --- a/framework/meta/src/cmd/standalone.rs +++ b/framework/meta/src/cmd/standalone.rs @@ -1,5 +1,6 @@ mod all; mod info; +pub mod install; mod local_deps; mod print_util; pub mod scen_test_gen; @@ -11,6 +12,7 @@ use crate::cli_args::{StandaloneCliAction, StandaloneCliArgs}; use all::call_all_meta; use clap::Parser; use info::call_info; +use install::install; use local_deps::local_deps; use scen_test_gen::test_gen_tool; use template::{create_contract, print_template_names}; @@ -39,6 +41,7 @@ pub fn cli_main_standalone() { test_gen_tool(args); }, Some(StandaloneCliAction::Test(args)) => test(args), + Some(StandaloneCliAction::Install(args)) => install(args), None => {}, } } diff --git a/framework/meta/src/cmd/standalone/install.rs b/framework/meta/src/cmd/standalone/install.rs new file mode 100644 index 0000000000..08996f1915 --- /dev/null +++ b/framework/meta/src/cmd/standalone/install.rs @@ -0,0 +1,9 @@ +mod install_scenario_go; + +use crate::cli_args::InstallArgs; + +pub fn install(args: &InstallArgs) { + if args.scenario_go { + install_scenario_go::ScenarioGoInstaller::new(args.tag.clone()).install(); + } +} diff --git a/framework/meta/src/cmd/standalone/install/install_scenario_go.rs b/framework/meta/src/cmd/standalone/install/install_scenario_go.rs new file mode 100644 index 0000000000..53781cf100 --- /dev/null +++ b/framework/meta/src/cmd/standalone/install/install_scenario_go.rs @@ -0,0 +1,168 @@ +use serde_json::Value; +use std::{ + fs::File, + io::Write, + path::{Path, PathBuf}, +}; + +use crate::print_util::println_green; + +const USER_AGENT: &str = "multiversx-sc-meta"; +const SCENARIO_CLI_RELEASES_BASE_URL: &str = + "https://api.github.com/repos/multiversx/mx-chain-scenario-cli-go/releases"; +const SCENARIO_CLI_ZIP_NAME: &str = "mx-scenario-go.zip"; +const CARGO_HOME: &str = env!("CARGO_HOME"); + +#[derive(Clone, Debug)] +pub struct ScenarioGoRelease { + pub tag_name: String, + pub download_url: String, +} + +#[derive(Clone, Debug)] +pub struct ScenarioGoInstaller { + tag: Option, + zip_name: String, + user_agent: String, + temp_dir_path: PathBuf, + cargo_bin_folder: PathBuf, +} + +impl ScenarioGoInstaller { + pub fn new(tag: Option) -> Self { + let cargo_home = PathBuf::from(CARGO_HOME); + let cargo_bin_folder = cargo_home.join("bin"); + ScenarioGoInstaller { + tag, + zip_name: SCENARIO_CLI_ZIP_NAME.to_string(), + user_agent: USER_AGENT.to_string(), + temp_dir_path: std::env::temp_dir(), + cargo_bin_folder, + } + } + + pub fn install(&self) { + let release_raw = self + .get_scenario_go_release_json() + .expect("couldn't retrieve mx-chain-scenario-cli-go release"); + + assert!( + !release_raw.contains("\"message\": \"Not Found\""), + "release not found: {release_raw}" + ); + + let release = self.parse_scenario_go_release(&release_raw); + self.download_zip(&release) + .expect("could not download artifact"); + + self.unzip_binaries(); + self.delete_temp_zip(); + } + + fn release_url(&self) -> String { + if let Some(tag) = &self.tag { + format!("{SCENARIO_CLI_RELEASES_BASE_URL}/tags/{tag}") + } else { + format!("{SCENARIO_CLI_RELEASES_BASE_URL}/latest") + } + } + + fn get_scenario_go_release_json(&self) -> Result { + let release_url = self.release_url(); + println_green(format!("Retrieving release info: {release_url}")); + + let response = reqwest::blocking::Client::builder() + .user_agent(&self.user_agent) + .build()? + .get(release_url) + .send()? + .text()?; + + Ok(response) + } + + fn parse_scenario_go_release(&self, raw_json: &str) -> ScenarioGoRelease { + let parsed: Value = serde_json::from_str(raw_json).unwrap(); + + let tag_name = parsed + .get("tag_name") + .expect("tag name not found") + .as_str() + .expect("malformed json"); + + let assets = parsed + .get("assets") + .expect("assets not found in release") + .as_array() + .expect("malformed json"); + + let zip_asset = assets + .iter() + .find(|asset| self.asset_is_zip(*asset)) + .expect("executable zip asset not found in release"); + + let download_url = zip_asset + .get("browser_download_url") + .expect("asset download url not found") + .as_str() + .expect("asset download url not a string"); + + ScenarioGoRelease { + tag_name: tag_name.to_string(), + download_url: download_url.to_string(), + } + } + + fn asset_is_zip(&self, asset: &Value) -> bool { + let name = asset + .get("name") + .expect("asset name not found") + .as_str() + .expect("asset name not a string"); + name == self.zip_name + } + + fn zip_temp_path(&self) -> PathBuf { + self.temp_dir_path.join(&self.zip_name) + } + + fn download_zip(&self, release: &ScenarioGoRelease) -> Result<(), reqwest::Error> { + println_green(format!("Downloading binaries: {}", &release.download_url)); + let response = reqwest::blocking::Client::builder() + .user_agent(&self.user_agent) + .build()? + .get(&release.download_url) + .send()? + .bytes()?; + if response.len() < 10000 { + panic!( + "Could not download artifact: {}", + String::from_utf8_lossy(&response) + ); + } + + println_green(format!("Saving to: {}", self.zip_temp_path().display())); + let mut file = match File::create(self.zip_temp_path()) { + Err(why) => panic!("couldn't create {why}"), + Ok(file) => file, + }; + file.write_all(&response).unwrap(); + Ok(()) + } + + fn unzip_binaries(&self) { + println_green(format!("Unzipping to: {}", self.cargo_bin_folder.display())); + let file = File::open(self.zip_temp_path()).unwrap(); + let mut zip = zip::ZipArchive::new(file).unwrap(); + zip.extract(Path::new(&self.cargo_bin_folder)) + .expect("Could not unzip artifact"); + } + + fn delete_temp_zip(&self) { + println_green(format!( + "Deleting temporary download: {}", + self.zip_temp_path().display() + )); + std::fs::remove_file(self.zip_temp_path()).unwrap(); + } +} diff --git a/framework/meta/src/print_util.rs b/framework/meta/src/print_util.rs index f8ff2eba74..e79df4f60b 100644 --- a/framework/meta/src/print_util.rs +++ b/framework/meta/src/print_util.rs @@ -2,6 +2,13 @@ use std::process::Command; use colored::Colorize; +/// Just for convenience, since we seem to be printing many things in green. +/// +/// The argument is of type `String` because the argument is always a `format!` expression. +pub fn println_green(s: String) { + println!("{}", s.green()); +} + pub fn format_command(command: &Command) -> String { let mut result = String::new(); for (key, opt_value) in command.get_envs() { @@ -41,18 +48,15 @@ pub fn print_copy_contract(source_wasm_path: &str, output_wasm_path: &str) { } pub fn print_call_wasm_opt(wasm_path: &str) { - println!("{}", format!("Calling wasm-opt on {wasm_path} ...").green(),); + println_green(format!("Calling wasm-opt on {wasm_path} ...")); } pub fn print_call_wasm2wat(wasm_path: &str, wat_path: &str) { - println!( - "{}", - format!("Extracting wat from {wasm_path} to {wat_path} ...").green(), - ); + println_green(format!("Extracting wat from {wasm_path} to {wat_path} ...")); } pub fn print_pack_mxsc_file(output_mxsc_path: &str) { - println!("{}", format!("Packing {output_mxsc_path} ...").green(),); + println_green(format!("Packing {output_mxsc_path} ...")); } pub fn print_contract_size(size: usize) { @@ -60,10 +64,7 @@ pub fn print_contract_size(size: usize) { } pub fn print_extract_imports(imports_path: &str) { - println!( - "{}", - format!("Extracting imports to {imports_path} ...").green(), - ); + println_green(format!("Extracting imports to {imports_path} ...")); } pub fn print_check_ei(ei_version: &str) { @@ -91,8 +92,7 @@ pub fn print_ignore_ei_check() { } pub fn print_workspace_target_dir(target_path_str: &str) { - println!( - "{}", - format!("Using workspace target directory: {target_path_str} ...").green() - ); + println_green(format!( + "Using workspace target directory: {target_path_str} ..." + )); } From 9521b926d18b9673a9bd3216a636c85fad542e02 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 19 Jan 2024 12:14:04 +0200 Subject: [PATCH 44/84] install scenario go - CLI --- .../meta/src/cli_args/cli_args_standalone.rs | 20 +++++++++++++++---- framework/meta/src/cmd/standalone/install.rs | 20 ++++++++++++++++--- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/framework/meta/src/cli_args/cli_args_standalone.rs b/framework/meta/src/cli_args/cli_args_standalone.rs index 312117f9db..39ca2b3675 100644 --- a/framework/meta/src/cli_args/cli_args_standalone.rs +++ b/framework/meta/src/cli_args/cli_args_standalone.rs @@ -260,12 +260,24 @@ pub struct TestGenArgs { pub create: bool, } -#[derive(Default, Clone, PartialEq, Eq, Debug, Args)] +#[derive(Default, PartialEq, Eq, Debug, Clone, Parser)] +#[command(propagate_version = true)] pub struct InstallArgs { - /// Install the `multiversx-scenario-go-cli`. - #[arg(short = 'g', long, verbatim_doc_comment)] - pub scenario_go: bool, + #[command(subcommand)] + pub command: Option, +} +#[derive(Clone, PartialEq, Eq, Debug, Subcommand)] +pub enum InstallCommand { + #[command(about = "Installs all the known tools")] + All, + + #[command(about = "Installs the `mx-scenario-go` tool")] + MxScenarioGo(InstallMxScenarioGoArgs), +} + +#[derive(Default, Clone, PartialEq, Eq, Debug, Args)] +pub struct InstallMxScenarioGoArgs { /// The framework version on which the contracts should be created. #[arg(long, verbatim_doc_comment)] pub tag: Option, diff --git a/framework/meta/src/cmd/standalone/install.rs b/framework/meta/src/cmd/standalone/install.rs index 08996f1915..5d8d941b49 100644 --- a/framework/meta/src/cmd/standalone/install.rs +++ b/framework/meta/src/cmd/standalone/install.rs @@ -1,9 +1,23 @@ mod install_scenario_go; -use crate::cli_args::InstallArgs; +use crate::cli_args::{InstallArgs, InstallCommand, InstallMxScenarioGoArgs}; + +use self::install_scenario_go::ScenarioGoInstaller; pub fn install(args: &InstallArgs) { - if args.scenario_go { - install_scenario_go::ScenarioGoInstaller::new(args.tag.clone()).install(); + let command = args + .command + .as_ref() + .expect("command expected after `install`"); + + match command { + InstallCommand::All => { + install_scenario_go(&InstallMxScenarioGoArgs::default()); + }, + InstallCommand::MxScenarioGo(sg_args) => install_scenario_go(sg_args), } } + +fn install_scenario_go(sg_args: &InstallMxScenarioGoArgs) { + ScenarioGoInstaller::new(sg_args.tag.clone()).install(); +} From 579be8953d67dd90849671c98605c8d89fd5887b Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Fri, 19 Jan 2024 14:18:28 +0100 Subject: [PATCH 45/84] revert fmt changes from scenario --- .../scenarios/stress_submit_test.scen.json | 718 +++++++++++------- 1 file changed, 462 insertions(+), 256 deletions(-) diff --git a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json index c0ff47a3cf..e1eec1cc6a 100644 --- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json +++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json @@ -281,11 +281,13 @@ "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f", "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f" ], - "gasLimit": "120,000,000" + "gasLimit": "120,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -297,11 +299,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -313,11 +317,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -329,11 +335,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -345,11 +353,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -361,11 +371,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -377,11 +389,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -393,11 +407,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -409,11 +425,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -425,11 +443,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -441,11 +461,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -457,11 +479,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -473,11 +497,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -489,11 +515,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -505,11 +533,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -521,11 +551,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -537,11 +569,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -553,11 +587,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -569,11 +605,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -585,11 +623,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -601,11 +641,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -617,11 +659,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -633,11 +677,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -649,11 +695,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -665,11 +713,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -681,11 +731,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -697,11 +749,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -713,11 +767,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -729,11 +785,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -745,11 +803,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -761,11 +821,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -777,11 +839,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -793,11 +857,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -809,11 +875,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -825,11 +893,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -841,11 +911,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -857,11 +929,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -873,11 +947,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -889,11 +965,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -905,11 +983,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -921,11 +1001,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -937,11 +1019,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -953,11 +1037,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -969,11 +1055,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -985,11 +1073,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1001,11 +1091,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1017,11 +1109,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1033,11 +1127,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1049,11 +1145,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1065,11 +1163,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1081,11 +1181,13 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1100,11 +1202,13 @@ "0x55534443", "0x" ], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1115,11 +1219,13 @@ "to": "sc:price-aggregator", "function": "unpause", "arguments": [], - "gasLimit": "5,000,000" + "gasLimit": "5,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1133,14 +1239,16 @@ "0x45474c44", "0x55534443", "0x5f", - "0xea70ca9a91d18271", + "0x619911dbb570258c", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1154,14 +1262,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xce1d764d9bfb7854", + "0x3cf8d3d3a05bf655", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1175,14 +1285,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x5c2737add325116f", + "0x4d92440172e0bf71", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1196,14 +1308,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xe27e5dc612456364", + "0xd971ed41066daa08", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1217,14 +1331,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x9c58bc1f626cb6a3", + "0x34a9348cb04afbd1", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1238,14 +1354,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x9068f4446fd2ae04", + "0x6c01a77d55c0861f", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1259,14 +1377,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xff5cf23c81ef3917", + "0xea1e93f2b82ec0f6", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1280,14 +1400,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xe7c12838b9771f0d", + "0x2f067fee00bbd5bc", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1301,14 +1423,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x7951c85c7aada436", + "0x1706fe5397a21f74", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1322,14 +1446,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x6c0190eb13a194be", + "0xbffd5631e9e448a8", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1343,14 +1469,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x14a496f92926e9b5", + "0x1940496d3bc8934c", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1364,14 +1492,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x7a3fdaa619bbff3b", + "0xbd0af0d3aba30235", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1385,14 +1515,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x8ba32f535a83c19f", + "0xebcf9494ec0fac0c", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1406,14 +1538,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xb4dcd2ddffcf59cc", + "0x7aeb67c3eabe498c", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1427,14 +1561,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x6d97d7d437f7391c", + "0x5c758d17b8445f7f", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1448,14 +1584,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x653f1b1655683896", + "0x6978fe48b9a58974", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1469,14 +1607,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xda4062ae7c6184a1", + "0x8692c26f665bc7ad", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1490,14 +1630,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x065464cf4c6ea105", + "0x2d3a93b7522e72b6", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1511,14 +1653,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x0cb9821748ad956c", + "0x4faa49415e935688", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1532,14 +1676,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x1b827e1858a67166", + "0x5cbca2cc253dbf54", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1553,14 +1699,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x1bd9792d3edc64ff", + "0xdd20d194dd695735", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1574,14 +1722,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x3599d17cbfb5c4ee", + "0x32f039c1765a2ec3", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1595,14 +1745,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xc65e751b22607656", + "0x84372c9de3d535d9", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1616,14 +1768,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xd4bbccef7ef3e7b4", + "0x91b23ed59de93417", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1637,14 +1791,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xfb37857d5530fcd0", + "0x4b81d1a55887f5f9", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1658,14 +1814,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x8df934cb90b71e8a", + "0xd88e348ef6679e1d", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1679,14 +1837,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x797dda97a2b25e35", + "0x2557834dc8059cc7", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1700,14 +1860,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x5b254f2fbb741680", + "0x22d86f8317546033", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1721,14 +1883,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x08b9538d10e65320", + "0x5a775ddd32ca5367", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1742,14 +1906,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x239d2e995b7a4894", + "0x59f049471cd2662c", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1763,14 +1929,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x7e79b8e4112cf678", + "0xb59fdc2aedbf845f", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1784,14 +1952,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xb09b8311215bab5e", + "0xab13e96eb802f883", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1805,14 +1975,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x0ec08ba689cbc952", + "0xf6f152ab53ad7170", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1826,14 +1998,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xacc5e6e196c8f3a2", + "0x5bae78b87d516979", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1847,14 +2021,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xc64fdfa560909ccf", + "0xe47859cc0fdb0abe", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1868,14 +2044,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x2c2ae119256b5aae", + "0x7c36ab1fa1a348b4", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1889,14 +2067,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xa6ffbeb92ecd79d7", + "0x7fda3ef39b74e04b", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1910,14 +2090,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xe5c75596603ce92b", + "0x461d81a84db50115", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1931,14 +2113,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x32c7a5176f9318d0", + "0xcc0ab8ccc363dd0c", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1952,14 +2136,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xd58a0c76a0d1118f", + "0x11c15058c7c6c1fa", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1973,14 +2159,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xc9e3b2f21e05a287", + "0x293b700535555d4f", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -1994,14 +2182,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xb88a7a86d1836794", + "0x4e8d04d2f0e53efd", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -2015,14 +2205,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x12deed12306ff1fb", + "0x42be3651d7b9499e", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -2036,14 +2228,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xeba9e8ef75b11054", + "0xb82a437fc87cd8a0", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -2057,14 +2251,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x97644d8258f30691", + "0xb12ebd0d9ff3f396", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -2078,14 +2274,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xfcc9924787c5bc88", + "0x85b4d01e5a20d445", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -2099,14 +2297,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x661199b6b7871218", + "0x92edaca582002375", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -2120,14 +2320,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x21792a541d619b73", + "0x351151b47fee6331", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -2141,14 +2343,16 @@ "0x45474c44", "0x55534443", "0x64", - "0x3667892bd8fa2283", + "0x9155d2992ceb6beb", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "7,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } }, { @@ -2162,14 +2366,16 @@ "0x45474c44", "0x55534443", "0x64", - "0xbaf637c9be0e4875", + "0xdbc0895ce5855dec", "0x" ], - "gasLimit": "7,000,000" + "gasLimit": "50,000,000", + "gasPrice": "" }, "expect": { "out": [], - "status": "0" + "status": "0", + "refund": "*" } } ] From f92a30b8c15daad38a245ada89b8a3cf25b8db97 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Sun, 21 Jan 2024 12:01:54 +0200 Subject: [PATCH 46/84] codec enum with 256 variants fix --- data/codec-derive/src/nested_de_derive.rs | 6 +- data/codec-derive/src/nested_en_derive.rs | 6 +- data/codec-derive/src/top_de_derive.rs | 6 +- data/codec-derive/src/top_en_derive.rs | 6 +- data/codec-derive/src/util.rs | 8 + data/codec/tests/derive_enum_test.rs | 267 ++++++++++++++++++++++ 6 files changed, 283 insertions(+), 16 deletions(-) diff --git a/data/codec-derive/src/nested_de_derive.rs b/data/codec-derive/src/nested_de_derive.rs index e9f8a489d0..838107da04 100644 --- a/data/codec-derive/src/nested_de_derive.rs +++ b/data/codec-derive/src/nested_de_derive.rs @@ -66,10 +66,8 @@ pub fn nested_decode_impl(ast: &syn::DeriveInput) -> TokenStream { } }, syn::Data::Enum(data_enum) => { - assert!( - data_enum.variants.len() < 256, - "enums with more than 256 variants not supported" - ); + validate_enum_variants(&data_enum.variants); + let variant_dep_decode_snippets = variant_dep_decode_snippets(name, data_enum, "e! {input}); diff --git a/data/codec-derive/src/nested_en_derive.rs b/data/codec-derive/src/nested_en_derive.rs index 096f6a04bc..11d28e3f07 100644 --- a/data/codec-derive/src/nested_en_derive.rs +++ b/data/codec-derive/src/nested_en_derive.rs @@ -56,10 +56,8 @@ pub fn nested_encode_impl(ast: &syn::DeriveInput) -> TokenStream { } }, syn::Data::Enum(data_enum) => { - assert!( - data_enum.variants.len() < 256, - "enums with more than 256 variants not supported" - ); + validate_enum_variants(&data_enum.variants); + let variant_dep_encode_snippets = variant_dep_encode_snippets(name, data_enum); quote! { diff --git a/data/codec-derive/src/top_de_derive.rs b/data/codec-derive/src/top_de_derive.rs index c5ec4cbfa4..59c1dad6fb 100644 --- a/data/codec-derive/src/top_de_derive.rs +++ b/data/codec-derive/src/top_de_derive.rs @@ -67,10 +67,8 @@ fn top_decode_method_body(ast: &syn::DeriveInput) -> proc_macro2::TokenStream { } }, syn::Data::Enum(data_enum) => { - assert!( - data_enum.variants.len() < 256, - "enums with more than 256 variants not supported" - ); + validate_enum_variants(&data_enum.variants); + if is_fieldless_enum(data_enum) { // fieldless enums are special, they can be top-decoded as u8 directly let top_decode_arms = fieldless_enum_match_arm_result_ok(name, data_enum); diff --git a/data/codec-derive/src/top_en_derive.rs b/data/codec-derive/src/top_en_derive.rs index 732d421285..35a46c5346 100644 --- a/data/codec-derive/src/top_en_derive.rs +++ b/data/codec-derive/src/top_en_derive.rs @@ -59,10 +59,8 @@ fn top_encode_method_body(ast: &syn::DeriveInput) -> proc_macro2::TokenStream { } }, syn::Data::Enum(data_enum) => { - assert!( - data_enum.variants.len() < 256, - "enums with more than 256 variants not supported" - ); + validate_enum_variants(&data_enum.variants); + let variant_top_encode_snippets = variant_top_encode_snippets(name, data_enum); quote! { diff --git a/data/codec-derive/src/util.rs b/data/codec-derive/src/util.rs index 380d7c94ee..92f9106fa1 100644 --- a/data/codec-derive/src/util.rs +++ b/data/codec-derive/src/util.rs @@ -1,4 +1,5 @@ use quote::quote; +use syn::{punctuated::Punctuated, token::Comma, Variant}; pub fn is_fieldless_enum(data_enum: &syn::DataEnum) -> bool { data_enum @@ -85,3 +86,10 @@ where syn::Fields::Unit => quote! {}, } } + +pub fn validate_enum_variants(variants: &Punctuated) { + assert!( + variants.len() <= 256, + "enums with more than 256 variants not supported" + ); +} diff --git a/data/codec/tests/derive_enum_test.rs b/data/codec/tests/derive_enum_test.rs index b7e01b045e..b4626400ac 100644 --- a/data/codec/tests/derive_enum_test.rs +++ b/data/codec/tests/derive_enum_test.rs @@ -116,3 +116,270 @@ fn field_enum_struct_variant() { check_top_encode_decode(enum_struct.clone(), enum_struct_bytes); check_dep_encode_decode(enum_struct, enum_struct_bytes); } + +#[derive(NestedEncode, NestedDecode, TopEncode, TopDecode, PartialEq, Eq, Clone, Debug)] +pub enum Enum256Variants { + Zero = 0, + One = 1, + Two = 2, + Three = 3, + Four = 4, + Five = 5, + Six = 6, + Seven = 7, + Eight = 8, + Nine = 9, + Ten = 10, + Eleven = 11, + Twelve = 12, + Thirteen = 13, + Fourteen = 14, + Fifteen = 15, + Sixteen = 16, + Seventeen = 17, + Eighteen = 18, + Nineteen = 19, + Twenty = 20, + TwentyOne = 21, + TwentyTwo = 22, + TwentyThree = 23, + TwentyFour = 24, + TwentyFive = 25, + TwentySix = 26, + TwentySeven = 27, + TwentyEight = 28, + TwentyNine = 29, + Thirty = 30, + ThirtyOne = 31, + ThirtyTwo = 32, + ThirtyThree = 33, + ThirtyFour = 34, + ThirtyFive = 35, + ThirtySix = 36, + ThirtySeven = 37, + ThirtyEight = 38, + ThirtyNine = 39, + Forty = 40, + FortyOne = 41, + FortyTwo = 42, + FortyThree = 43, + FortyFour = 44, + FortyFive = 45, + FortySix = 46, + FortySeven = 47, + FortyEight = 48, + FortyNine = 49, + Fifty = 50, + FiftyOne = 51, + FiftyTwo = 52, + FiftyThree = 53, + FiftyFour = 54, + FiftyFive = 55, + FiftySix = 56, + FiftySeven = 57, + FiftyEight = 58, + FiftyNine = 59, + Sixty = 60, + SixtyOne = 61, + SixtyTwo = 62, + SixtyThree = 63, + SixtyFour = 64, + SixtyFive = 65, + SixtySix = 66, + SixtySeven = 67, + SixtyEight = 68, + SixtyNine = 69, + Seventy = 70, + SeventyOne = 71, + SeventyTwo = 72, + SeventyThree = 73, + SeventyFour = 74, + SeventyFive = 75, + SeventySix = 76, + SeventySeven = 77, + SeventyEight = 78, + SeventyNine = 79, + Eighty = 80, + EightyOne = 81, + EightyTwo = 82, + EightyThree = 83, + EightyFour = 84, + EightyFive = 85, + EightySix = 86, + EightySeven = 87, + EightyEight = 88, + EightyNine = 89, + Ninety = 90, + NinetyOne = 91, + NinetyTwo = 92, + NinetyThree = 93, + NinetyFour = 94, + NinetyFive = 95, + NinetySix = 96, + NinetySeven = 97, + NinetyEight = 98, + NinetyNine = 99, + OneHundred = 100, + OneHundredOne = 101, + OneHundredTwo = 102, + OneHundredThree = 103, + OneHundredFour = 104, + OneHundredFive = 105, + OneHundredSix = 106, + OneHundredSeven = 107, + OneHundredEight = 108, + OneHundredNine = 109, + OneHundredTen = 110, + OneHundredEleven = 111, + OneHundredTwelve = 112, + OneHundredThirteen = 113, + OneHundredFourteen = 114, + OneHundredFifteen = 115, + OneHundredSixteen = 116, + OneHundredSeventeen = 117, + OneHundredEighteen = 118, + OneHundredNineteen = 119, + OneHundredTwenty = 120, + OneHundredTwentyOne = 121, + OneHundredTwentyTwo = 122, + OneHundredTwentyThree = 123, + OneHundredTwentyFour = 124, + OneHundredTwentyFive = 125, + OneHundredTwentySix = 126, + OneHundredTwentySeven = 127, + OneHundredTwentyEight = 128, + OneHundredTwentyNine = 129, + OneHundredThirty = 130, + OneHundredThirtyOne = 131, + OneHundredThirtyTwo = 132, + OneHundredThirtyThree = 133, + OneHundredThirtyFour = 134, + OneHundredThirtyFive = 135, + OneHundredThirtySix = 136, + OneHundredThirtySeven = 137, + OneHundredThirtyEight = 138, + OneHundredThirtyNine = 139, + OneHundredForty = 140, + OneHundredFortyOne = 141, + OneHundredFortyTwo = 142, + OneHundredFortyThree = 143, + OneHundredFortyFour = 144, + OneHundredFortyFive = 145, + OneHundredFortySix = 146, + OneHundredFortySeven = 147, + OneHundredFortyEight = 148, + OneHundredFortyNine = 149, + OneHundredFifty = 150, + OneHundredFiftyOne = 151, + OneHundredFiftyTwo = 152, + OneHundredFiftyThree = 153, + OneHundredFiftyFour = 154, + OneHundredFiftyFive = 155, + OneHundredFiftySix = 156, + OneHundredFiftySeven = 157, + OneHundredFiftyEight = 158, + OneHundredFiftyNine = 159, + OneHundredSixty = 160, + OneHundredSixtyOne = 161, + OneHundredSixtyTwo = 162, + OneHundredSixtyThree = 163, + OneHundredSixtyFour = 164, + OneHundredSixtyFive = 165, + OneHundredSixtySix = 166, + OneHundredSixtySeven = 167, + OneHundredSixtyEight = 168, + OneHundredSixtyNine = 169, + OneHundredSeventy = 170, + OneHundredSeventyOne = 171, + OneHundredSeventyTwo = 172, + OneHundredSeventyThree = 173, + OneHundredSeventyFour = 174, + OneHundredSeventyFive = 175, + OneHundredSeventySix = 176, + OneHundredSeventySeven = 177, + OneHundredSeventyEight = 178, + OneHundredSeventyNine = 179, + OneHundredEighty = 180, + OneHundredEightyOne = 181, + OneHundredEightyTwo = 182, + OneHundredEightyThree = 183, + OneHundredEightyFour = 184, + OneHundredEightyFive = 185, + OneHundredEightySix = 186, + OneHundredEightySeven = 187, + OneHundredEightyEight = 188, + OneHundredEightyNine = 189, + OneHundredNinety = 190, + OneHundredNinetyOne = 191, + OneHundredNinetyTwo = 192, + OneHundredNinetyThree = 193, + OneHundredNinetyFour = 194, + OneHundredNinetyFive = 195, + OneHundredNinetySix = 196, + OneHundredNinetySeven = 197, + OneHundredNinetyEight = 198, + OneHundredNinetyNine = 199, + TwoHundred = 200, + TwoHundredOne = 201, + TwoHundredTwo = 202, + TwoHundredThree = 203, + TwoHundredFour = 204, + TwoHundredFive = 205, + TwoHundredSix = 206, + TwoHundredSeven = 207, + TwoHundredEight = 208, + TwoHundredNine = 209, + TwoTen = 210, + TwoEleven = 211, + TwoTwelve = 212, + TwoThirteen = 213, + TwoFourteen = 214, + TwoFifteen = 215, + TwoSixteen = 216, + TwoSeventeen = 217, + TwoEighteen = 218, + TwoNineteen = 219, + TwoTwenty = 220, + TwoTwentyOne = 221, + TwoTwentyTwo = 222, + TwoTwentyThree = 223, + TwoTwentyFour = 224, + TwoTwentyFive = 225, + TwoTwentySix = 226, + TwoTwentySeven = 227, + TwoTwentyEight = 228, + TwoTwentyNine = 229, + TwoThirty = 230, + TwoThirtyOne = 231, + TwoThirtyTwo = 232, + TwoThirtyThree = 233, + TwoThirtyFour = 234, + TwoThirtyFive = 235, + TwoThirtySix = 236, + TwoThirtySeven = 237, + TwoThirtyEight = 238, + TwoThirtyNine = 239, + TwoForty = 240, + TwoFortyOne = 241, + TwoFortyTwo = 242, + TwoFortyThree = 243, + TwoFortyFour = 244, + TwoFortyFive = 245, + TwoFortySix = 246, + TwoFortySeven = 247, + TwoFortyEight = 248, + TwoFortyNine = 249, + TwoFifty = 250, + TwoFiftyOne = 251, + TwoFiftyTwo = 252, + TwoFiftyThree = 253, + TwoFiftyFour = 254, + TwoFiftyFive = 255, +} + +#[test] +fn enum_256_variants() { + check_top_encode_decode(Enum256Variants::Zero, &[][..]); + check_top_encode_decode(Enum256Variants::One, &[1u8][..]); + check_dep_encode_decode(Enum256Variants::TwoFiftyFive, &[255u8][..]); +} From b7f60224a5d45fb8b81d1591baa5e73177ac64f3 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 22 Jan 2024 14:43:30 +0200 Subject: [PATCH 47/84] install scenario go - install based on os --- framework/meta/src/cmd/standalone/install.rs | 1 + .../cmd/standalone/install/install_scenario_go.rs | 12 ++++++++++-- .../meta/src/cmd/standalone/install/system_info.rs | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 framework/meta/src/cmd/standalone/install/system_info.rs diff --git a/framework/meta/src/cmd/standalone/install.rs b/framework/meta/src/cmd/standalone/install.rs index 5d8d941b49..e96f23ad70 100644 --- a/framework/meta/src/cmd/standalone/install.rs +++ b/framework/meta/src/cmd/standalone/install.rs @@ -1,4 +1,5 @@ mod install_scenario_go; +mod system_info; use crate::cli_args::{InstallArgs, InstallCommand, InstallMxScenarioGoArgs}; diff --git a/framework/meta/src/cmd/standalone/install/install_scenario_go.rs b/framework/meta/src/cmd/standalone/install/install_scenario_go.rs index 53781cf100..4325db5a55 100644 --- a/framework/meta/src/cmd/standalone/install/install_scenario_go.rs +++ b/framework/meta/src/cmd/standalone/install/install_scenario_go.rs @@ -7,10 +7,11 @@ use std::{ use crate::print_util::println_green; +use super::system_info::{get_system_info, SystemInfo}; + const USER_AGENT: &str = "multiversx-sc-meta"; const SCENARIO_CLI_RELEASES_BASE_URL: &str = "https://api.github.com/repos/multiversx/mx-chain-scenario-cli-go/releases"; -const SCENARIO_CLI_ZIP_NAME: &str = "mx-scenario-go.zip"; const CARGO_HOME: &str = env!("CARGO_HOME"); #[derive(Clone, Debug)] @@ -28,13 +29,20 @@ pub struct ScenarioGoInstaller { cargo_bin_folder: PathBuf, } +fn select_zip_name() -> String { + match get_system_info() { + SystemInfo::Linux => "mx_scenario_go_linux_amd64.zip".to_string(), + SystemInfo::MacOs => "mx_scenario_go_darwin_amd64.zip".to_string(), + } +} + impl ScenarioGoInstaller { pub fn new(tag: Option) -> Self { let cargo_home = PathBuf::from(CARGO_HOME); let cargo_bin_folder = cargo_home.join("bin"); ScenarioGoInstaller { tag, - zip_name: SCENARIO_CLI_ZIP_NAME.to_string(), + zip_name: select_zip_name(), user_agent: USER_AGENT.to_string(), temp_dir_path: std::env::temp_dir(), cargo_bin_folder, diff --git a/framework/meta/src/cmd/standalone/install/system_info.rs b/framework/meta/src/cmd/standalone/install/system_info.rs new file mode 100644 index 0000000000..e789bcc021 --- /dev/null +++ b/framework/meta/src/cmd/standalone/install/system_info.rs @@ -0,0 +1,14 @@ +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub enum SystemInfo { + Linux, + MacOs, +} + +pub fn get_system_info() -> SystemInfo { + let os = std::env::consts::OS; + match os { + "linux" => SystemInfo::Linux, + "macos" => SystemInfo::MacOs, + _ => panic!("unknown configuration: {os}"), + } +} From 51756cfa0a84eff86a3934df418b6b5c5ba9c562 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 22 Jan 2024 14:46:41 +0200 Subject: [PATCH 48/84] clippy fix --- .../meta/src/cmd/standalone/install/install_scenario_go.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/meta/src/cmd/standalone/install/install_scenario_go.rs b/framework/meta/src/cmd/standalone/install/install_scenario_go.rs index 4325db5a55..0a5798f792 100644 --- a/framework/meta/src/cmd/standalone/install/install_scenario_go.rs +++ b/framework/meta/src/cmd/standalone/install/install_scenario_go.rs @@ -106,7 +106,7 @@ impl ScenarioGoInstaller { let zip_asset = assets .iter() - .find(|asset| self.asset_is_zip(*asset)) + .find(|asset| self.asset_is_zip(asset)) .expect("executable zip asset not found in release"); let download_url = zip_asset From c7c7d8e7fd6acd73400aebeca999e027adcd9c5a Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Mon, 22 Jan 2024 13:59:55 +0100 Subject: [PATCH 49/84] test fix, internal consistency shouldn't be called at sc level --- .../storage_mapper_get_at_address.scen.json | 21 ------------------- .../src/storage_mapper_get_at_address.rs | 8 ------- 2 files changed, 29 deletions(-) diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json index f9b4e026e7..faf77f5d75 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json @@ -152,27 +152,6 @@ "gas": "*", "refund": "*" } - }, - { - "step": "scCall", - "id": "check internal consistency at address", - "tx": { - "from": "address:an_account", - "to": "sc:basic-features", - "function": "check_internal_consistency_at_address", - "arguments": [], - "gasLimit": "50,000,000", - "gasPrice": "0" - }, - "expect": { - "out": [ - "0x01" - ], - "status": "", - "logs": "*", - "gas": "*", - "refund": "*" - } } ] } \ No newline at end of file diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs index 2bf406e195..4ffcfe9948 100644 --- a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs +++ b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs @@ -37,12 +37,4 @@ pub trait StorageMapperGetAtAddress { SetMapper::new_from_address(address, StorageKey::from("set_mapper")); mapper.len() } - - #[endpoint] - fn check_internal_consistency_at_address(&self) -> bool { - let address = self.contract_address().get(); - let mapper: SetMapper = - SetMapper::new_from_address(address, StorageKey::from("set_mapper")); - mapper.check_internal_consistency() - } } From 1e3d40debbdd73f6f41fa0ebec5ad88aaae27c01 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 22 Jan 2024 15:48:58 +0200 Subject: [PATCH 50/84] replaced go backend binary name --- .../scenario/src/facade/scenario_world.rs | 4 +-- framework/scenario/src/vm_go_tool.rs | 29 ++++++++++++------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/framework/scenario/src/facade/scenario_world.rs b/framework/scenario/src/facade/scenario_world.rs index 9ead1a9280..d760c1743a 100644 --- a/framework/scenario/src/facade/scenario_world.rs +++ b/framework/scenario/src/facade/scenario_world.rs @@ -12,7 +12,7 @@ use crate::{ scenario::{run_trace::ScenarioTrace, run_vm::ScenarioVMRunner}, scenario_format::{interpret_trait::InterpreterContext, value_interpreter::interpret_string}, scenario_model::BytesValue, - vm_go_tool::run_vm_go_tool, + vm_go_tool::run_mx_scenario_go, }; use multiversx_sc_meta::find_workspace::find_current_workspace; use std::path::{Path, PathBuf}; @@ -75,7 +75,7 @@ impl ScenarioWorld { debugger.run_scenario_file(&absolute_path); }, Backend::VmGoBackend => { - run_vm_go_tool(&absolute_path); + run_mx_scenario_go(&absolute_path); }, } } diff --git a/framework/scenario/src/vm_go_tool.rs b/framework/scenario/src/vm_go_tool.rs index 54dc00e965..45da6b22a1 100644 --- a/framework/scenario/src/vm_go_tool.rs +++ b/framework/scenario/src/vm_go_tool.rs @@ -1,20 +1,28 @@ use colored::Colorize; -use std::{io::ErrorKind, path::Path, process::Command}; +use std::{ + io::{Error, ErrorKind}, + path::Path, + process::{Command, Output}, +}; -const RUNNER_TOOL_NAME: &str = "run-scenarios"; -const RUNNER_TOOL_NAME_LEGACY: &str = "mandos-test"; +const RUNNER_TOOL_NAME: &str = "mx-scenario-go"; +const RUNNER_TOOL_NAME_LEGACY: &str = "run-scenarios"; /// Just marks that the tool was not found. struct ToolNotFound; /// Runs the VM executable, /// which reads parses and executes one or more mandos tests. -pub fn run_vm_go_tool(absolute_path: &Path) { +pub fn run_mx_scenario_go(absolute_path: &Path) { if cfg!(not(feature = "run-go-tests")) { return; } - if run_scenario_tool(RUNNER_TOOL_NAME, absolute_path).is_ok() { + let output = Command::new(RUNNER_TOOL_NAME) + .arg("run") + .arg(absolute_path) + .output(); + if run_scenario_tool(RUNNER_TOOL_NAME, output).is_ok() { return; } @@ -23,23 +31,22 @@ pub fn run_vm_go_tool(absolute_path: &Path) { "{}", format!("Warning: `{RUNNER_TOOL_NAME}` not found. Using `{RUNNER_TOOL_NAME_LEGACY}` as fallback.").yellow(), ); - if run_scenario_tool(RUNNER_TOOL_NAME_LEGACY, absolute_path).is_ok() { + let output = Command::new(RUNNER_TOOL_NAME).arg(absolute_path).output(); + if run_scenario_tool(RUNNER_TOOL_NAME_LEGACY, output).is_ok() { return; } panic!("Could not find `{RUNNER_TOOL_NAME_LEGACY}`, aborting."); } -fn run_scenario_tool(tool_name: &str, path: &Path) -> Result<(), ToolNotFound> { - let result = Command::new(tool_name).arg(path).output(); - - if let Err(error) = &result { +fn run_scenario_tool(tool_name: &str, output: Result) -> Result<(), ToolNotFound> { + if let Err(error) = &output { if error.kind() == ErrorKind::NotFound { return Err(ToolNotFound); } } - let output = result.expect("failed to execute process"); + let output = output.expect("failed to execute process"); if output.status.success() { println!("{}", String::from_utf8_lossy(output.stdout.as_slice())); From d05e5e50e3f7c88af929e56c68e5a573fd2d7635 Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Mon, 22 Jan 2024 15:17:04 +0100 Subject: [PATCH 51/84] removed get-at-address, duplicated basic-features in set mapper get at address test --- Cargo.lock | 16 -- Cargo.toml | 3 - .../storage_mapper_get_at_address.scen.json | 26 +-- .../src/storage_mapper_get_at_address.rs | 12 ++ .../basic-features/wasm/src/lib.rs | 2 +- .../feature-tests/get-at-address/Cargo.toml | 17 -- .../feature-tests/get-at-address/README.md | 3 - .../get-at-address/meta/Cargo.toml | 13 -- .../get-at-address/meta/src/main.rs | 3 - .../get-at-address/multiversx.json | 3 - .../feature-tests/get-at-address/src/lib.rs | 24 --- .../get-at-address/wasm/Cargo.lock | 170 ------------------ .../get-at-address/wasm/Cargo.toml | 32 ---- .../get-at-address/wasm/src/lib.rs | 28 --- .../scenario/tests/test_hash_set_mapper.rs | 30 +++- 15 files changed, 53 insertions(+), 329 deletions(-) delete mode 100644 contracts/feature-tests/get-at-address/Cargo.toml delete mode 100644 contracts/feature-tests/get-at-address/README.md delete mode 100644 contracts/feature-tests/get-at-address/meta/Cargo.toml delete mode 100644 contracts/feature-tests/get-at-address/meta/src/main.rs delete mode 100644 contracts/feature-tests/get-at-address/multiversx.json delete mode 100644 contracts/feature-tests/get-at-address/src/lib.rs delete mode 100644 contracts/feature-tests/get-at-address/wasm/Cargo.lock delete mode 100644 contracts/feature-tests/get-at-address/wasm/Cargo.toml delete mode 100644 contracts/feature-tests/get-at-address/wasm/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 55d41ce861..677d15ee9a 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -1203,22 +1203,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "get-at-address" -version = "0.0.0" -dependencies = [ - "multiversx-sc", - "multiversx-sc-scenario", -] - -[[package]] -name = "get-at-address-meta" -version = "0.0.0" -dependencies = [ - "get-at-address", - "multiversx-sc-meta", -] - [[package]] name = "getrandom" version = "0.2.11" diff --git a/Cargo.toml b/Cargo.toml index a0fbb1b68f..ef92a8a7b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -175,7 +175,4 @@ members = [ "contracts/feature-tests/rust-testing-framework-tester/meta", "contracts/feature-tests/use-module", "contracts/feature-tests/use-module/meta", - - "contracts/feature-tests/get-at-address", - "contracts/feature-tests/get-at-address/meta", ] diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json index faf77f5d75..b3768235b6 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json @@ -5,15 +5,15 @@ { "step": "setState", "accounts": { - "sc:basic-features": { + "sc:caller": { "nonce": "0", "balance": "0", "code": "file:../output/basic-features.wasm" }, - "sc:get-at-address": { + "sc:to-be-called": { "nonce": "0", "balance": "0", - "code": "file:../../get-at-address/output/get-at-address.wasm" + "code": "file:../output/basic-features.wasm" }, "address:an_account": { "nonce": "0", @@ -26,10 +26,10 @@ "id": "set contract address", "tx": { "from": "address:an_account", - "to": "sc:basic-features", + "to": "sc:caller", "function": "set_contract_address", "arguments": [ - "sc:get-at-address" + "sc:to-be-called" ], "gasLimit": "50,000,000", "gasPrice": "0" @@ -47,7 +47,7 @@ "id": "fill set mapper", "tx": { "from": "address:an_account", - "to": "sc:get-at-address", + "to": "sc:to-be-called", "function": "fill_set_mapper", "arguments": [ "10" @@ -66,19 +66,19 @@ { "step": "checkState", "accounts": { - "sc:basic-features": { + "sc:caller": { "nonce": "0", "balance": "0", "storage": { - "str:contract_address": "sc:get-at-address" + "str:contract_address": "sc:to-be-called" }, "code": "file:../output/basic-features.wasm" }, - "sc:get-at-address": { + "sc:to-be-called": { "nonce": "0", "balance": "0", "storage": "*", - "code": "file:../../get-at-address/output/get-at-address.wasm" + "code": "file:../output/basic-features.wasm" }, "address:an_account": { "nonce": "*", @@ -93,7 +93,7 @@ "id": "is empty at address", "tx": { "from": "address:an_account", - "to": "sc:basic-features", + "to": "sc:caller", "function": "is_empty_at_address", "arguments": [], "gasLimit": "50,000,000", @@ -114,7 +114,7 @@ "id": "contains at address", "tx": { "from": "address:an_account", - "to": "sc:basic-features", + "to": "sc:caller", "function": "contains_at_address", "arguments": [ "5" @@ -137,7 +137,7 @@ "id": "len at address", "tx": { "from": "address:an_account", - "to": "sc:basic-features", + "to": "sc:caller", "function": "len_at_address", "arguments": [], "gasLimit": "50,000,000", diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs index 4ffcfe9948..34c61e6b87 100644 --- a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs +++ b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs @@ -37,4 +37,16 @@ pub trait StorageMapperGetAtAddress { SetMapper::new_from_address(address, StorageKey::from("set_mapper")); mapper.len() } + + /// Storage to be called. For testing, this contract is deployed twice, + /// and this module acts both as caller and receiver + #[storage_mapper("set_mapper")] + fn set_mapper(&self) -> SetMapper; + + #[endpoint] + fn fill_set_mapper(&self, value: u32) { + for item in 1u32..=value { + self.set_mapper().insert(item); + } + } } diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs index f7fbe79efd..2cf279041e 100644 --- a/contracts/feature-tests/basic-features/wasm/src/lib.rs +++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs @@ -392,7 +392,7 @@ multiversx_sc_wasm_adapter::endpoints! { is_empty_at_address => is_empty_at_address contains_at_address => contains_at_address len_at_address => len_at_address - check_internal_consistency_at_address => check_internal_consistency_at_address + fill_set_mapper => fill_set_mapper ) } diff --git a/contracts/feature-tests/get-at-address/Cargo.toml b/contracts/feature-tests/get-at-address/Cargo.toml deleted file mode 100644 index 04e9d1827e..0000000000 --- a/contracts/feature-tests/get-at-address/Cargo.toml +++ /dev/null @@ -1,17 +0,0 @@ -[package] -name = "get-at-address" -version = "0.0.0" -authors = ["Andrei Marinica "] -edition = "2021" -publish = false - -[lib] -path = "src/lib.rs" - -[dependencies.multiversx-sc] -version = "0.46.0" -path = "../../../framework/base" - -[dev-dependencies.multiversx-sc-scenario] -version = "0.46.0" -path = "../../../framework/scenario" diff --git a/contracts/feature-tests/get-at-address/README.md b/contracts/feature-tests/get-at-address/README.md deleted file mode 100644 index c52cb7aac5..0000000000 --- a/contracts/feature-tests/get-at-address/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Get At Address - -`Get At Address` is a simple Smart Contract meant to be called by the StorageGetAtAddress module of basic-features. diff --git a/contracts/feature-tests/get-at-address/meta/Cargo.toml b/contracts/feature-tests/get-at-address/meta/Cargo.toml deleted file mode 100644 index 8df2577e6f..0000000000 --- a/contracts/feature-tests/get-at-address/meta/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "get-at-address-meta" -version = "0.0.0" -edition = "2021" -publish = false - -[dependencies.get-at-address] -path = ".." - -[dependencies.multiversx-sc-meta] -version = "0.46.0" -path = "../../../../framework/meta" -default-features = false diff --git a/contracts/feature-tests/get-at-address/meta/src/main.rs b/contracts/feature-tests/get-at-address/meta/src/main.rs deleted file mode 100644 index eb6f026d97..0000000000 --- a/contracts/feature-tests/get-at-address/meta/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - multiversx_sc_meta::cli_main::(); -} diff --git a/contracts/feature-tests/get-at-address/multiversx.json b/contracts/feature-tests/get-at-address/multiversx.json deleted file mode 100644 index 7365539625..0000000000 --- a/contracts/feature-tests/get-at-address/multiversx.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "language": "rust" -} \ No newline at end of file diff --git a/contracts/feature-tests/get-at-address/src/lib.rs b/contracts/feature-tests/get-at-address/src/lib.rs deleted file mode 100644 index c31889cef1..0000000000 --- a/contracts/feature-tests/get-at-address/src/lib.rs +++ /dev/null @@ -1,24 +0,0 @@ -#![no_std] - -multiversx_sc::imports!(); -/// This contract's storage gets called by the StorageMapperGetAtAddress module of basic-features -#[multiversx_sc::contract] -pub trait GetAtAddress { - #[storage_mapper("set_mapper")] - fn set_mapper(&self) -> SetMapper; - - #[init] - fn init(&self) {} - - #[upgrade] - fn upgrade(&self) { - self.init(); - } - - #[endpoint] - fn fill_set_mapper(&self, value: u32) { - for item in 1u32..=value { - self.set_mapper().insert(item); - } - } -} diff --git a/contracts/feature-tests/get-at-address/wasm/Cargo.lock b/contracts/feature-tests/get-at-address/wasm/Cargo.lock deleted file mode 100644 index 00743b3d40..0000000000 --- a/contracts/feature-tests/get-at-address/wasm/Cargo.lock +++ /dev/null @@ -1,170 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "get-at-address" -version = "0.0.0" -dependencies = [ - "multiversx-sc", -] - -[[package]] -name = "get-at-address-wasm" -version = "0.0.0" -dependencies = [ - "get-at-address", - "multiversx-sc-wasm-adapter", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hex-literal" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" - -[[package]] -name = "multiversx-sc" -version = "0.46.0" -dependencies = [ - "bitflags", - "hex-literal", - "multiversx-sc-codec", - "multiversx-sc-derive", - "num-traits", -] - -[[package]] -name = "multiversx-sc-codec" -version = "0.18.3" -dependencies = [ - "arrayvec", - "multiversx-sc-codec-derive", -] - -[[package]] -name = "multiversx-sc-codec-derive" -version = "0.18.3" -dependencies = [ - "hex", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "multiversx-sc-derive" -version = "0.46.0" -dependencies = [ - "hex", - "proc-macro2", - "quote", - "radix_trie", - "syn", -] - -[[package]] -name = "multiversx-sc-wasm-adapter" -version = "0.46.0" -dependencies = [ - "multiversx-sc", -] - -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "proc-macro2" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "syn" -version = "2.0.48" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" diff --git a/contracts/feature-tests/get-at-address/wasm/Cargo.toml b/contracts/feature-tests/get-at-address/wasm/Cargo.toml deleted file mode 100644 index d1cebf8fea..0000000000 --- a/contracts/feature-tests/get-at-address/wasm/Cargo.toml +++ /dev/null @@ -1,32 +0,0 @@ -# Code generated by the multiversx-sc build system. DO NOT EDIT. - -# ########################################## -# ############## AUTO-GENERATED ############# -# ########################################## - -[package] -name = "get-at-address-wasm" -version = "0.0.0" -edition = "2021" -publish = false - -[lib] -crate-type = ["cdylib"] - -[profile.release] -codegen-units = 1 -opt-level = "z" -lto = true -debug = false -panic = "abort" -overflow-checks = false - -[dependencies.get-at-address] -path = ".." - -[dependencies.multiversx-sc-wasm-adapter] -version = "0.46.0" -path = "../../../../framework/wasm-adapter" - -[workspace] -members = ["."] diff --git a/contracts/feature-tests/get-at-address/wasm/src/lib.rs b/contracts/feature-tests/get-at-address/wasm/src/lib.rs deleted file mode 100644 index 7c526bd7f6..0000000000 --- a/contracts/feature-tests/get-at-address/wasm/src/lib.rs +++ /dev/null @@ -1,28 +0,0 @@ -// Code generated by the multiversx-sc build system. DO NOT EDIT. - -//////////////////////////////////////////////////// -////////////////// AUTO-GENERATED ////////////////// -//////////////////////////////////////////////////// - -// Init: 1 -// Endpoints: 2 -// Async Callback (empty): 1 -// Total number of exported functions: 4 - -#![no_std] -#![allow(internal_features)] -#![feature(lang_items)] - -multiversx_sc_wasm_adapter::allocator!(); -multiversx_sc_wasm_adapter::panic_handler!(); - -multiversx_sc_wasm_adapter::endpoints! { - get_at_address - ( - init => init - upgrade => upgrade - fill_set_mapper => fill_set_mapper - ) -} - -multiversx_sc_wasm_adapter::async_callback_empty! {} diff --git a/framework/scenario/tests/test_hash_set_mapper.rs b/framework/scenario/tests/test_hash_set_mapper.rs index ed4efac19c..d52e50088a 100644 --- a/framework/scenario/tests/test_hash_set_mapper.rs +++ b/framework/scenario/tests/test_hash_set_mapper.rs @@ -1,6 +1,9 @@ -use multiversx_sc::storage::{ - mappers::{SetMapper, StorageClearable, StorageMapper}, - StorageKey, +use multiversx_sc::{ + storage::{ + mappers::{SetMapper, StorageClearable, StorageMapper}, + StorageKey, + }, + types::ManagedAddress, }; use multiversx_sc_scenario::api::SingleTxApi; @@ -9,6 +12,13 @@ fn create_set() -> SetMapper { SetMapper::new(base_key) } +fn create_set_at_address( + address: ManagedAddress, +) -> SetMapper> { + let base_key = StorageKey::new(&b"my_remote_set"[..]); + SetMapper::new_from_address(address, base_key) +} + fn check_set(set: &SetMapper, expected: Vec) { assert_eq!(set.len(), expected.len()); assert!(set.check_internal_consistency()); @@ -16,6 +26,14 @@ fn check_set(set: &SetMapper, expected: Vec) { assert_eq!(actual, expected); } +fn check_set_at_address( + set: &SetMapper>, + expected_len: usize, +) { + assert_eq!(set.len(), expected_len); + assert!(set.check_internal_consistency()); +} + #[test] fn test_hash_set_simple() { let mut set = create_set(); @@ -80,3 +98,9 @@ fn test_set_clear() { assert_eq!(set.len(), 0); assert!(set.is_empty()); } + +#[test] +fn test_set_at_address() { + let set = create_set_at_address(ManagedAddress::default()); + check_set_at_address(&set, 0usize); +} From d49e55e1fc429530a23c302ccba4220d78216311 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 22 Jan 2024 16:27:14 +0200 Subject: [PATCH 52/84] go backend call fix --- framework/scenario/src/vm_go_tool.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/scenario/src/vm_go_tool.rs b/framework/scenario/src/vm_go_tool.rs index 45da6b22a1..8eb82a7bde 100644 --- a/framework/scenario/src/vm_go_tool.rs +++ b/framework/scenario/src/vm_go_tool.rs @@ -31,7 +31,7 @@ pub fn run_mx_scenario_go(absolute_path: &Path) { "{}", format!("Warning: `{RUNNER_TOOL_NAME}` not found. Using `{RUNNER_TOOL_NAME_LEGACY}` as fallback.").yellow(), ); - let output = Command::new(RUNNER_TOOL_NAME).arg(absolute_path).output(); + let output = Command::new(RUNNER_TOOL_NAME_LEGACY).arg(absolute_path).output(); if run_scenario_tool(RUNNER_TOOL_NAME_LEGACY, output).is_ok() { return; } From 809348d493a7bc115068dd158388f2db50170c60 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 22 Jan 2024 16:53:02 +0200 Subject: [PATCH 53/84] CI install via sc-meta --- .github/workflows/actions.yml | 161 ++++++++++++++++++++++++++++++++-- 1 file changed, 153 insertions(+), 8 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index da0eb08d28..a47223de5e 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -12,11 +12,156 @@ permissions: pull-requests: write jobs: - contracts: - name: Contracts - uses: multiversx/mx-sc-actions/.github/workflows/contracts.yml@v2.3.5 - with: - rust-toolchain: nightly-2023-12-11 - vmtools-version: v1.5.19 - secrets: - token: ${{ secrets.GITHUB_TOKEN }} + wasm_test: + name: Wasm tests + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Install rust + uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + toolchain: nightly-2023-12-11 + target: wasm32-unknown-unknown + + - name: Setup the PATH variable + run: | + echo "PATH=$HOME/.local/bin:$HOME/multiversx-sdk/vmtools:$PATH" >> $GITHUB_ENV + + - name: Install prerequisites + run: | + pip3 install ${{ inputs.pip-mxpy-args }} + mkdir $HOME/multiversx-sdk + python3 -m multiversx_sdk_cli.cli config set "dependencies.vmtools.urlTemplate.linux" ${{ inputs.vmtools-repository }} + python3 -m multiversx_sdk_cli.cli config set "dependencies.vmtools.tag" ${{ inputs.vmtools-version }} + python3 -m multiversx_sdk_cli.cli deps install vmtools --overwrite + + cargo install wasm-opt + cargo install twiggy + + cargo install --path framework/meta + sc-meta install mx-scenario-go --tag v0.0.101-alpha.1 + + which wasm-opt + which wasm2wat + which run-scenarios + which mx-scenario-go + + - name: Install libtinfo5 + if: inputs.install-libtinfo5 + run: | + sudo apt update + sudo apt install -y libtinfo5 + + - name: Build the wasm contracts + env: + RUSTFLAGS: "" + run: sc-meta all build --no-imports --target-dir $(pwd)/target --path . + + - name: Run the wasm tests + env: + RUSTFLAGS: "" + run: + cargo test --features multiversx-sc-scenario/run-go-tests + + - name: Generate the contract report + env: + RUSTFLAGS: "" + run: | + sc-meta all build-dbg --twiggy-paths --target-dir $(pwd)/target --path . + python3 -m multiversx_sdk_cli.cli contract report --skip-build --skip-twiggy --output-format json --output-file report.json + + - name: Upload the report json + uses: actions/upload-artifact@v3 + with: + name: report + path: report.json + + - name: Download the base report + uses: dawidd6/action-download-artifact@v2 + if: github.event_name == 'pull_request' + continue-on-error: true + with: + workflow: actions.yml + name: report + commit: ${{ github.event.pull_request.base.sha }} + path: base-report + + - name: Generate the report template + if: github.event_name == 'pull_request' + run: | + echo "Contract comparison - from {{ .base }} to {{ .head }}" > report.md + if [ ! -f base-report/report.json ] + then + echo ":warning: Warning: Could not download the report for the base branch. Displaying only the report for the current branch. :warning:" >> report.md + python3 -m multiversx_sdk_cli.cli contract report --compare report.json --output-format github-markdown --output-file report-table.md + else + python3 -m multiversx_sdk_cli.cli contract report --compare base-report/report.json report.json --output-format github-markdown --output-file report-table.md + fi + cat report-table.md >> report.md + + - name: Render the report from the template + id: template + uses: chuhlomin/render-template@v1 + if: github.event_name == 'pull_request' + with: + template: report.md + vars: | + base: ${{ github.event.pull_request.base.sha }} + head: ${{ github.event.pull_request.head.sha }} + + - name: Upload the report markdown + uses: actions/upload-artifact@v3 + if: github.event_name == 'pull_request' + with: + name: report-markdown + path: report.md + + - name: Find the comment containing the report + id: fc + uses: peter-evans/find-comment@v2 + if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository + with: + issue-number: ${{ github.event.pull_request.number }} + comment-author: 'github-actions[bot]' + body-includes: 'Contract comparison' + + - name: Create or update the report comment + uses: peter-evans/create-or-update-comment@v2 + if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository + with: + comment-id: ${{ steps.fc.outputs.comment-id }} + issue-number: ${{ github.event.pull_request.number }} + body: ${{ steps.template.outputs.result }} + edit-mode: replace + + rust_test: + name: Rust tests + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + toolchain: ${{ inputs.rust-toolchain }} + + - name: Run the rust tests + env: + RUSTFLAGS: "" + run: + cargo test + + clippy_check: + name: Clippy linter check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions-rust-lang/setup-rust-toolchain@v1 + with: + toolchain: ${{ inputs.rust-toolchain }} + components: clippy + - uses: giraffate/clippy-action@v1 + env: + RUSTFLAGS: "" + with: + github_token: ${{ secrets.token }} + clippy_flags: ${{ inputs.clippy-args }} \ No newline at end of file From c72e3c30562836bb5c8f23b92181c608dedbd68f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Mon, 22 Jan 2024 17:14:07 +0200 Subject: [PATCH 54/84] Mxpy not installed anymore. --- .github/workflows/actions.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index a47223de5e..9ac2521d73 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -24,18 +24,8 @@ jobs: toolchain: nightly-2023-12-11 target: wasm32-unknown-unknown - - name: Setup the PATH variable - run: | - echo "PATH=$HOME/.local/bin:$HOME/multiversx-sdk/vmtools:$PATH" >> $GITHUB_ENV - - name: Install prerequisites run: | - pip3 install ${{ inputs.pip-mxpy-args }} - mkdir $HOME/multiversx-sdk - python3 -m multiversx_sdk_cli.cli config set "dependencies.vmtools.urlTemplate.linux" ${{ inputs.vmtools-repository }} - python3 -m multiversx_sdk_cli.cli config set "dependencies.vmtools.tag" ${{ inputs.vmtools-version }} - python3 -m multiversx_sdk_cli.cli deps install vmtools --overwrite - cargo install wasm-opt cargo install twiggy @@ -47,12 +37,6 @@ jobs: which run-scenarios which mx-scenario-go - - name: Install libtinfo5 - if: inputs.install-libtinfo5 - run: | - sudo apt update - sudo apt install -y libtinfo5 - - name: Build the wasm contracts env: RUSTFLAGS: "" @@ -164,4 +148,4 @@ jobs: RUSTFLAGS: "" with: github_token: ${{ secrets.token }} - clippy_flags: ${{ inputs.clippy-args }} \ No newline at end of file + clippy_flags: ${{ inputs.clippy-args }} From cd19580d361db5f6d009ee7630fbc9a42a70c2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Mon, 22 Jan 2024 17:18:00 +0200 Subject: [PATCH 55/84] Replace all inputs. --- .github/workflows/actions.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 9ac2521d73..cace23e30d 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -34,7 +34,6 @@ jobs: which wasm-opt which wasm2wat - which run-scenarios which mx-scenario-go - name: Build the wasm contracts @@ -126,7 +125,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: ${{ inputs.rust-toolchain }} + toolchain: nightly-2023-12-11 - name: Run the rust tests env: @@ -141,11 +140,11 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: ${{ inputs.rust-toolchain }} + toolchain: nightly-2023-12-11 components: clippy - uses: giraffate/clippy-action@v1 env: RUSTFLAGS: "" with: github_token: ${{ secrets.token }} - clippy_flags: ${{ inputs.clippy-args }} + clippy_flags: --all-targets --all-features From dee38b228bddaafd841505d822072eaf038e2c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Mon, 22 Jan 2024 17:19:32 +0200 Subject: [PATCH 56/84] Install mxpy (for contract reports). --- .github/workflows/actions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index cace23e30d..f7c8c0bd1f 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -26,6 +26,8 @@ jobs: - name: Install prerequisites run: | + pipx install multiversx-sdk-cli==v9.3.1 + cargo install wasm-opt cargo install twiggy From 7ba2b01eb569f7da975f19dd3931bde0c6f42eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Mon, 22 Jan 2024 17:29:56 +0200 Subject: [PATCH 57/84] Additional fixes (wasm2wat, github token). --- .github/workflows/actions.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index f7c8c0bd1f..4c2445213d 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -35,7 +35,6 @@ jobs: sc-meta install mx-scenario-go --tag v0.0.101-alpha.1 which wasm-opt - which wasm2wat which mx-scenario-go - name: Build the wasm contracts @@ -148,5 +147,5 @@ jobs: env: RUSTFLAGS: "" with: - github_token: ${{ secrets.token }} + github_token: ${{ github.token }} clippy_flags: --all-targets --all-features From f1c36968480a445901eca5cbb3f55f584597ef52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrei=20B=C4=83ncioiu?= Date: Mon, 22 Jan 2024 17:48:18 +0200 Subject: [PATCH 58/84] Fix invocation of mxpy. --- .github/workflows/actions.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 4c2445213d..d0fa487127 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -34,6 +34,7 @@ jobs: cargo install --path framework/meta sc-meta install mx-scenario-go --tag v0.0.101-alpha.1 + which mxpy which wasm-opt which mx-scenario-go @@ -53,7 +54,7 @@ jobs: RUSTFLAGS: "" run: | sc-meta all build-dbg --twiggy-paths --target-dir $(pwd)/target --path . - python3 -m multiversx_sdk_cli.cli contract report --skip-build --skip-twiggy --output-format json --output-file report.json + mxpy contract report --skip-build --skip-twiggy --output-format json --output-file report.json - name: Upload the report json uses: actions/upload-artifact@v3 @@ -78,9 +79,9 @@ jobs: if [ ! -f base-report/report.json ] then echo ":warning: Warning: Could not download the report for the base branch. Displaying only the report for the current branch. :warning:" >> report.md - python3 -m multiversx_sdk_cli.cli contract report --compare report.json --output-format github-markdown --output-file report-table.md + mxpy contract report --compare report.json --output-format github-markdown --output-file report-table.md else - python3 -m multiversx_sdk_cli.cli contract report --compare base-report/report.json report.json --output-format github-markdown --output-file report-table.md + mxpy contract report --compare base-report/report.json report.json --output-format github-markdown --output-file report-table.md fi cat report-table.md >> report.md From 1b162b8fb505156e3424356fef4f68c3ea7ed7a9 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Tue, 23 Jan 2024 10:36:21 +0200 Subject: [PATCH 59/84] exact deps for base framework --- contracts/core/price-aggregator/Cargo.toml | 2 +- contracts/examples/check-pause/Cargo.toml | 2 +- contracts/examples/crowdfunding-esdt/Cargo.toml | 2 +- contracts/examples/empty/Cargo.toml | 2 +- contracts/examples/multisig/Cargo.toml | 2 +- .../rust-testing-framework-tester/Cargo.toml | 2 +- data/codec-derive/Cargo.toml | 8 ++++---- data/codec/Cargo.toml | 4 ++-- framework/base/Cargo.toml | 6 +++--- framework/derive/Cargo.toml | 10 +++++----- tools/mxpy-snippet-generator/Cargo.toml | 2 +- vm/Cargo.toml | 4 ++-- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml index 58fd5c9646..294d8cf640 100644 --- a/contracts/core/price-aggregator/Cargo.toml +++ b/contracts/core/price-aggregator/Cargo.toml @@ -31,6 +31,6 @@ version = "0.46.1" path = "../../../framework/scenario" [dependencies] -arrayvec = { version = "0.7.1", default-features = false } +arrayvec = { version = "0.7", default-features = false } rand = { version = "0.8.5" } getrandom = { version = "0.2", features = ["js"] } diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml index 1378777b4e..dd297827fe 100644 --- a/contracts/examples/check-pause/Cargo.toml +++ b/contracts/examples/check-pause/Cargo.toml @@ -9,7 +9,7 @@ publish = false path = "src/check_pause.rs" [dev-dependencies] -num-bigint = "0.4.2" +num-bigint = "0.4" [dependencies.multiversx-sc] version = "0.46.1" diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml index 280017fbc0..f18e6854d9 100644 --- a/contracts/examples/crowdfunding-esdt/Cargo.toml +++ b/contracts/examples/crowdfunding-esdt/Cargo.toml @@ -17,6 +17,6 @@ version = "0.46.1" path = "../../../framework/scenario" [dev-dependencies] -num-bigint = "0.4.2" +num-bigint = "0.4" num-traits = "0.2" hex = "0.4" diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml index 10eda8b158..537ed4bd4c 100644 --- a/contracts/examples/empty/Cargo.toml +++ b/contracts/examples/empty/Cargo.toml @@ -17,4 +17,4 @@ version = "0.46.1" path = "../../../framework/scenario" [dev-dependencies] -num-bigint = "0.4.2" +num-bigint = "0.4" diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml index d203bf5adc..97fa928c50 100644 --- a/contracts/examples/multisig/Cargo.toml +++ b/contracts/examples/multisig/Cargo.toml @@ -31,6 +31,6 @@ version = "0.46.1" path = "../../core/wegld-swap" [dev-dependencies] -num-bigint = "0.4.2" +num-bigint = "0.4" num-traits = "0.2" hex = "0.4" diff --git a/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml b/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml index 0ca8591668..4875f04281 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml +++ b/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml @@ -21,7 +21,7 @@ version = "0.46.1" path = "../../../framework/scenario" [dev-dependencies] -num-bigint = "0.4.2" +num-bigint = "0.4" num-traits = "0.2" hex = "0.4" diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml index ffa8ae4d13..1f2b6810ce 100644 --- a/data/codec-derive/Cargo.toml +++ b/data/codec-derive/Cargo.toml @@ -21,7 +21,7 @@ proc-macro = true default = ["syn/full", "syn/parsing", "syn/extra-traits"] [dependencies] -proc-macro2 = "1.0.66" -quote = "1.0.33" -syn = "2.0.39" -hex = "0.4" +proc-macro2 = "=1.0.75" +quote = "=1.0.35" +syn = "=2.0.48" +hex = "=0.4.3" diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml index 6ff2fbdf9c..493a56e228 100644 --- a/data/codec/Cargo.toml +++ b/data/codec/Cargo.toml @@ -23,8 +23,8 @@ version = "=0.18.3" optional = true [dependencies] -arrayvec = { version = "0.7.1", default-features = false } -num-bigint = { version = "0.4.2", optional = true } # can only be used in std contexts +arrayvec = { version = "=0.7.4", default-features = false } +num-bigint = { version = "=0.4.4", optional = true } # can only be used in std contexts [dev-dependencies.multiversx-sc-codec-derive] path = "../codec-derive" diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml index 75afbeaadf..a19c500af1 100644 --- a/framework/base/Cargo.toml +++ b/framework/base/Cargo.toml @@ -22,9 +22,9 @@ alloc = ["multiversx-sc-codec/alloc"] esdt-token-payment-legacy-decode = [] [dependencies] -hex-literal = "0.4.1" -bitflags = "2.4.1" -num-traits = { version = "0.2", default-features = false } +hex-literal = "=0.4.1" +bitflags = "=2.4.1" +num-traits = { version = "=0.2.17", default-features = false } [dependencies.multiversx-sc-derive] version = "=0.46.1" diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml index b2c88fcedb..3b489d2a4e 100644 --- a/framework/derive/Cargo.toml +++ b/framework/derive/Cargo.toml @@ -14,11 +14,11 @@ keywords = ["multiversx", "blockchain", "contract"] categories = ["cryptography::cryptocurrencies", "development-tools::procedural-macro-helpers"] [dependencies] -proc-macro2 = "1.0.66" -quote = "1.0.33" -syn = "2.0.39" -hex = "0.4" -radix_trie = "0.2.1" +proc-macro2 = "=1.0.75" +quote = "=1.0.35" +syn = "=2.0.48" +hex = "=0.4.3" +radix_trie = "=0.2.1" [features] default = ["syn/full", "syn/parsing", "syn/extra-traits"] diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml index 3580d6fd32..ee8d88e681 100644 --- a/tools/mxpy-snippet-generator/Cargo.toml +++ b/tools/mxpy-snippet-generator/Cargo.toml @@ -15,6 +15,6 @@ path = "../../framework/base" [dependencies] bech32 = "0.9" -num-bigint = "0.4.2" +num-bigint = "0.4" num-traits = "0.2" hex = "0.4" diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 6e3ffa45bf..1850dce047 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -26,8 +26,8 @@ rand = "0.8.5" rand_seeder = "0.2.2" ed25519-dalek = "2.0.0" itertools = "0.12.0" -hex-literal = "0.4.1" -bitflags = "2.4.1" +hex-literal = "=0.4.1" +bitflags = "=2.4.1" [dependencies.multiversx-chain-vm-executor] version = "0.2.0" From eae25fabc237b7b08feac2a70433d79e266f36e4 Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Tue, 23 Jan 2024 12:04:53 +0100 Subject: [PATCH 60/84] iter impls, reorg, fmt --- .../src/storage_mapper_get_at_address.rs | 2 +- ...s_storage_mapper_get_at_address_go_test.rs | 2 +- .../base/src/storage/mappers/map_mapper.rs | 243 ++++++++---------- .../src/storage/mappers/map_storage_mapper.rs | 170 ++++++------ .../base/src/storage/mappers/queue_mapper.rs | 187 ++------------ .../base/src/storage/mappers/set_mapper.rs | 78 ++---- 6 files changed, 238 insertions(+), 444 deletions(-) diff --git a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs index 34c61e6b87..601c0d8eec 100644 --- a/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs +++ b/contracts/feature-tests/basic-features/src/storage_mapper_get_at_address.rs @@ -38,7 +38,7 @@ pub trait StorageMapperGetAtAddress { mapper.len() } - /// Storage to be called. For testing, this contract is deployed twice, + /// Storage to be called. For testing, this contract is deployed twice, /// and this module acts both as caller and receiver #[storage_mapper("set_mapper")] fn set_mapper(&self) -> SetMapper; diff --git a/contracts/feature-tests/basic-features/tests/basic_features_storage_mapper_get_at_address_go_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_storage_mapper_get_at_address_go_test.rs index ef457ce5ce..b746a1f337 100644 --- a/contracts/feature-tests/basic-features/tests/basic_features_storage_mapper_get_at_address_go_test.rs +++ b/contracts/feature-tests/basic-features/tests/basic_features_storage_mapper_get_at_address_go_test.rs @@ -7,4 +7,4 @@ fn world() -> ScenarioWorld { #[test] fn storage_mapper_get_at_address_go() { world().run("scenarios/storage_mapper_get_at_address.scen.json"); -} \ No newline at end of file +} diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs index e04d204156..30b87f8eb7 100644 --- a/framework/base/src/storage/mappers/map_mapper.rs +++ b/framework/base/src/storage/mappers/map_mapper.rs @@ -16,7 +16,7 @@ use crate::{ }; const MAPPED_VALUE_IDENTIFIER: &[u8] = b".mapped"; -type Keys<'a, SA, T> = set_mapper::Iter<'a, SA, T>; +type Keys<'a, SA, A, T> = set_mapper::Iter<'a, SA, A, T>; pub struct MapMapper where @@ -67,17 +67,6 @@ where K: TopEncode + TopDecode + NestedEncode + NestedDecode, V: TopEncode + TopDecode, { - fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey { - let mut named_key = self.base_key.clone(); - named_key.append_bytes(name); - named_key.append_item(key); - named_key - } - - fn get_mapped_value(&self, key: &K) -> V { - storage_get(self.build_named_key(MAPPED_VALUE_IDENTIFIER, key).as_ref()) - } - fn set_mapped_value(&self, key: &K, value: &V) { storage_set( self.build_named_key(MAPPED_VALUE_IDENTIFIER, key).as_ref(), @@ -89,46 +78,6 @@ where storage_clear(self.build_named_key(MAPPED_VALUE_IDENTIFIER, key).as_ref()); } - /// Returns `true` if the map contains no elements. - pub fn is_empty(&self) -> bool { - self.keys_set.is_empty() - } - - /// Returns the number of elements in the map. - pub fn len(&self) -> usize { - self.keys_set.len() - } - - /// Returns `true` if the map contains a value for the specified key. - pub fn contains_key(&self, k: &K) -> bool { - self.keys_set.contains(k) - } - - /// Gets the given key's corresponding entry in the map for in-place manipulation. - pub fn entry(&mut self, key: K) -> Entry<'_, SA, StorageSCAddress, K, V> { - if self.contains_key(&key) { - Entry::Occupied(OccupiedEntry { - key, - map: self, - _marker: PhantomData, - }) - } else { - Entry::Vacant(VacantEntry { - key, - map: self, - _marker: PhantomData, - }) - } - } - - /// Gets a reference to the value in the entry. - pub fn get(&self, k: &K) -> Option { - if self.keys_set.contains(k) { - return Some(self.get_mapped_value(k)); - } - None - } - /// Sets the value of the entry, and returns the entry's old value. pub fn insert(&mut self, k: K, v: V) -> Option { let old_value = self.get(&k); @@ -146,32 +95,52 @@ where } None } +} - /// An iterator visiting all keys in arbitrary order. - /// The iterator element type is `&'a K`. - pub fn keys(&self) -> Keys { - self.keys_set.iter() +impl MapMapper> +where + SA: StorageMapperApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode, + V: TopEncode + TopDecode, +{ + pub fn new_from_address(address: ManagedAddress, base_key: StorageKey) -> Self { + MapMapper { + _phantom_api: PhantomData, + base_key: base_key.clone(), + keys_set: SetMapper::new_from_address(address, base_key), + _phantom_value: PhantomData, + } } +} - /// An iterator visiting all values in arbitrary order. - /// The iterator element type is `&'a V`. - pub fn values(&self) -> Values { - Values::new(self) - } +impl<'a, SA, A, K, V> IntoIterator for &'a MapMapper +where + SA: StorageMapperApi, + A: StorageAddress, + K: TopEncode + TopDecode + NestedEncode + NestedDecode, + V: TopEncode + TopDecode, +{ + type Item = (K, V); - /// An iterator visiting all key-value pairs in arbitrary order. - /// The iterator element type is `(&'a K, &'a V)`. - pub fn iter(&self) -> Iter { - Iter::new(self) + type IntoIter = Iter<'a, SA, A, K, V>; + + fn into_iter(self) -> Self::IntoIter { + self.iter() } } -impl MapMapper> +impl MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, + A: StorageAddress, V: TopEncode + TopDecode, { + /// Returns `true` if the map contains a value for the specified key. + pub fn contains_key(&self, k: &K) -> bool { + self.keys_set.contains(k) + } + fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey { let mut named_key = self.base_key.clone(); named_key.append_bytes(name); @@ -183,6 +152,18 @@ where storage_get(self.build_named_key(MAPPED_VALUE_IDENTIFIER, key).as_ref()) } + /// Gets a reference to the value in the entry. + pub fn get(&self, k: &K) -> Option { + if self.keys_set.contains(k) { + return Some(self.get_mapped_value(k)); + } + None + } + + pub fn keys(&self) -> Keys { + self.keys_set.iter() + } + /// Returns `true` if the map contains no elements. pub fn is_empty(&self) -> bool { self.keys_set.is_empty() @@ -193,13 +174,8 @@ where self.keys_set.len() } - /// Returns `true` if the map contains a value for the specified key. - pub fn contains_key(&self, k: &K) -> bool { - self.keys_set.contains(k) - } - /// Gets the given key's corresponding entry in the map for in-place manipulation. - pub fn entry(&mut self, key: K) -> Entry<'_, SA, ManagedAddress, K, V> { + pub fn entry(&mut self, key: K) -> Entry<'_, SA, A, K, V> { if self.contains_key(&key) { Entry::Occupied(OccupiedEntry { key, @@ -215,45 +191,16 @@ where } } - /// Gets a reference to the value in the entry. - pub fn get(&self, k: &K) -> Option { - if self.keys_set.contains(k) { - return Some(self.get_mapped_value(k)); - } - None + /// An iterator visiting all values in arbitrary order. + /// The iterator element type is `&'a V`. + pub fn values(&self) -> Values { + Values::new(self) } - // An iterator visiting all keys in arbitrary order. - // The iterator element type is `&'a K`. - // pub fn keys(&self) -> Keys { - // self.keys_set.iter() - // } - - // An iterator visiting all values in arbitrary order. - // The iterator element type is `&'a V`. - // pub fn values(&self) -> Values, K, V> { - // Values::new(self) - // } - - // An iterator visiting all key-value pairs in arbitrary order. - // The iterator element type is `(&'a K, &'a V)`. - // pub fn iter(&self) -> Iter { - // Iter::new(self) - // } -} - -impl<'a, SA, K, V> IntoIterator for &'a MapMapper -where - SA: StorageMapperApi, - K: TopEncode + TopDecode + NestedEncode + NestedDecode, - V: TopEncode + TopDecode, -{ - type Item = (K, V); - - type IntoIter = Iter<'a, SA, StorageSCAddress, K, V>; - - fn into_iter(self) -> Self::IntoIter { - self.iter() + /// An iterator visiting all key-value pairs in arbitrary order. + /// The iterator element type is `(&'a K, &'a V)`. + pub fn iter(&self) -> Iter { + Iter::new(self) } } @@ -264,19 +211,18 @@ where A: StorageAddress, V: TopEncode + TopDecode + 'static, { - key_iter: Keys<'a, SA, K>, + key_iter: Keys<'a, SA, A, K>, hash_map: &'a MapMapper, } -impl<'a, SA, K, V> Iter<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> Iter<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: TopEncode + TopDecode + 'static, { - fn new( - hash_map: &'a MapMapper, - ) -> Iter<'a, SA, StorageSCAddress, K, V> { + fn new(hash_map: &'a MapMapper) -> Iter<'a, SA, A, K, V> { Iter { key_iter: hash_map.keys(), hash_map, @@ -284,9 +230,10 @@ where } } -impl<'a, SA, K, V> Iterator for Iter<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> Iterator for Iter<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: TopEncode + TopDecode + 'static, { @@ -309,19 +256,18 @@ where A: StorageAddress, V: TopEncode + TopDecode + 'static, { - key_iter: Keys<'a, SA, K>, + key_iter: Keys<'a, SA, A, K>, hash_map: &'a MapMapper, } -impl<'a, SA, K, V> Values<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> Values<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: TopEncode + TopDecode + 'static, { - fn new( - hash_map: &'a MapMapper, - ) -> Values<'a, SA, StorageSCAddress, K, V> { + fn new(hash_map: &'a MapMapper) -> Values<'a, SA, A, K, V> { Values { key_iter: hash_map.keys(), hash_map, @@ -329,9 +275,10 @@ where } } -impl<'a, SA, K, V> Iterator for Values<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> Iterator for Values<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: TopEncode + TopDecode + 'static, { @@ -393,6 +340,22 @@ where pub(super) _marker: PhantomData<&'a mut (K, V)>, } +impl<'a, SA, A, K, V> Entry<'a, SA, A, K, V> +where + SA: StorageMapperApi, + A: StorageAddress, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, + V: TopEncode + TopDecode + 'static, +{ + /// Returns a reference to this entry's key. + pub fn key(&self) -> &K { + match *self { + Entry::Occupied(ref entry) => entry.key(), + Entry::Vacant(ref entry) => entry.key(), + } + } +} + impl<'a, SA, K, V> Entry<'a, SA, StorageSCAddress, K, V> where SA: StorageMapperApi, @@ -439,14 +402,6 @@ where } } - /// Returns a reference to this entry's key. - pub fn key(&self) -> &K { - match *self { - Entry::Occupied(ref entry) => entry.key(), - Entry::Vacant(ref entry) => entry.key(), - } - } - /// Provides in-place mutable access to an occupied entry before any /// potential inserts into the map. pub fn and_modify(self, f: F) -> Self @@ -479,9 +434,10 @@ where } } -impl<'a, SA, K, V> VacantEntry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> VacantEntry<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, V: TopEncode + TopDecode + 'static, { @@ -490,7 +446,14 @@ where pub fn key(&self) -> &K { &self.key } +} +impl<'a, SA, K, V> VacantEntry<'a, SA, StorageSCAddress, K, V> +where + SA: StorageMapperApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, + V: TopEncode + TopDecode + 'static, +{ /// Sets the value of the entry with the `VacantEntry`'s key, /// and returns an `OccupiedEntry`. pub fn insert(self, value: V) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { @@ -503,9 +466,10 @@ where } } -impl<'a, SA, K, V> OccupiedEntry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> OccupiedEntry<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, V: TopEncode + TopDecode + 'static, { @@ -514,17 +478,24 @@ where &self.key } + /// Gets the value in the entry. + pub fn get(&self) -> V { + self.map.get(&self.key).unwrap() + } +} + +impl<'a, SA, K, V> OccupiedEntry<'a, SA, StorageSCAddress, K, V> +where + SA: StorageMapperApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, + V: TopEncode + TopDecode + 'static, +{ /// Take ownership of the key and value from the map. pub fn remove_entry(self) -> (K, V) { let value = self.map.remove(&self.key).unwrap(); (self.key, value) } - /// Gets the value in the entry. - pub fn get(&self) -> V { - self.map.get(&self.key).unwrap() - } - /// Syntactic sugar, to more compactly express a get, update and set in one line. /// Takes whatever lies in storage, apples the given closure and saves the final value back to storage. /// Propagates the return value of the given function. diff --git a/framework/base/src/storage/mappers/map_storage_mapper.rs b/framework/base/src/storage/mappers/map_storage_mapper.rs index cedc2d72c8..fb2ec92b1e 100644 --- a/framework/base/src/storage/mappers/map_storage_mapper.rs +++ b/framework/base/src/storage/mappers/map_storage_mapper.rs @@ -12,7 +12,7 @@ use crate::{ }; const MAPPED_STORAGE_VALUE_IDENTIFIER: &[u8] = b".storage"; -type Keys<'a, SA, T> = set_mapper::Iter<'a, SA, T>; +type Keys<'a, SA, A, T> = set_mapper::Iter<'a, SA, A, T>; pub struct MapStorageMapper where @@ -63,58 +63,6 @@ where K: TopEncode + TopDecode + NestedEncode + NestedDecode, V: StorageMapper + StorageClearable, { - fn build_named_key(&self, name: &[u8], key: &K) -> StorageKey { - let mut named_key = self.base_key.clone(); - named_key.append_bytes(name); - named_key.append_item(key); - named_key - } - - fn get_mapped_storage_value(&self, key: &K) -> V { - let key = self.build_named_key(MAPPED_STORAGE_VALUE_IDENTIFIER, key); - >::new(key) - } - - /// Returns `true` if the map contains no elements. - pub fn is_empty(&self) -> bool { - self.keys_set.is_empty() - } - - /// Returns the number of elements in the map. - pub fn len(&self) -> usize { - self.keys_set.len() - } - - /// Returns `true` if the map contains a value for the specified key. - pub fn contains_key(&self, k: &K) -> bool { - self.keys_set.contains(k) - } - - /// Gets a reference to the value in the entry. - pub fn get(&self, k: &K) -> Option { - if self.keys_set.contains(k) { - return Some(self.get_mapped_storage_value(k)); - } - None - } - - /// Gets the given key's corresponding entry in the map for in-place manipulation. - pub fn entry(&mut self, key: K) -> Entry { - if self.contains_key(&key) { - Entry::Occupied(OccupiedEntry { - key, - map: self, - _marker: PhantomData, - }) - } else { - Entry::Vacant(VacantEntry { - key, - map: self, - _marker: PhantomData, - }) - } - } - /// Adds a default value for the key, if it is not already present. /// /// If the map did not have this key present, `true` is returned. @@ -136,29 +84,28 @@ where } false } +} - /// An iterator visiting all keys in arbitrary order. - /// The iterator element type is `&'a K`. - pub fn keys(&self) -> Keys { - self.keys_set.iter() - } - - /// An iterator visiting all values in arbitrary order. - /// The iterator element type is `&'a V`. - pub fn values(&self) -> Values { - Values::new(self) - } - - /// An iterator visiting all key-value pairs in arbitrary order. - /// The iterator element type is `(&'a K, &'a V)`. - pub fn iter(&self) -> Iter { - Iter::new(self) +impl MapStorageMapper> +where + SA: StorageMapperApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode, + V: StorageMapper + StorageClearable, +{ + pub fn new_from_address(address: ManagedAddress, base_key: StorageKey) -> Self { + MapStorageMapper { + _phantom_api: PhantomData, + base_key: base_key.clone(), + keys_set: SetMapper::new_from_address(address, base_key), + _phantom_value: PhantomData, + } } } -impl MapStorageMapper> +impl MapStorageMapper where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode, V: StorageMapper + StorageClearable, { @@ -174,6 +121,18 @@ where >::new(key) } + /// Gets a reference to the value in the entry. + pub fn get(&self, k: &K) -> Option { + if self.keys_set.contains(k) { + return Some(self.get_mapped_storage_value(k)); + } + None + } + + pub fn keys(&self) -> Keys { + self.keys_set.iter() + } + /// Returns `true` if the map contains no elements. pub fn is_empty(&self) -> bool { self.keys_set.is_empty() @@ -189,16 +148,8 @@ where self.keys_set.contains(k) } - /// Gets a reference to the value in the entry. - pub fn get(&self, k: &K) -> Option { - if self.keys_set.contains(k) { - return Some(self.get_mapped_storage_value(k)); - } - None - } - /// Gets the given key's corresponding entry in the map for in-place manipulation. - pub fn entry(&mut self, key: K) -> Entry, K, V> { + pub fn entry(&mut self, key: K) -> Entry { if self.contains_key(&key) { Entry::Occupied(OccupiedEntry { key, @@ -213,17 +164,30 @@ where }) } } + + /// An iterator visiting all values in arbitrary order. + /// The iterator element type is `&'a V`. + pub fn values(&self) -> Values { + Values::new(self) + } + + /// An iterator visiting all key-value pairs in arbitrary order. + /// The iterator element type is `(&'a K, &'a V)`. + pub fn iter(&self) -> Iter { + Iter::new(self) + } } -impl<'a, SA, K, V> IntoIterator for &'a MapStorageMapper +impl<'a, SA, A, K, V> IntoIterator for &'a MapStorageMapper where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: StorageMapper + StorageClearable, { type Item = (K, V); - type IntoIter = Iter<'a, SA, StorageSCAddress, K, V>; + type IntoIter = Iter<'a, SA, A, K, V>; fn into_iter(self) -> Self::IntoIter { self.iter() @@ -237,19 +201,18 @@ where A: StorageAddress, V: StorageMapper + StorageClearable, { - key_iter: Keys<'a, SA, K>, + key_iter: Keys<'a, SA, A, K>, hash_map: &'a MapStorageMapper, } -impl<'a, SA, K, V> Iter<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> Iter<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: StorageMapper + StorageClearable, { - fn new( - hash_map: &'a MapStorageMapper, - ) -> Iter<'a, SA, StorageSCAddress, K, V> { + fn new(hash_map: &'a MapStorageMapper) -> Iter<'a, SA, A, K, V> { Iter { key_iter: hash_map.keys(), hash_map, @@ -257,9 +220,10 @@ where } } -impl<'a, SA, K, V> Iterator for Iter<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> Iterator for Iter<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: StorageMapper + StorageClearable, { @@ -282,19 +246,18 @@ where A: StorageAddress, V: StorageMapper + StorageClearable, { - key_iter: Keys<'a, SA, K>, + key_iter: Keys<'a, SA, A, K>, hash_map: &'a MapStorageMapper, } -impl<'a, SA, K, V> Values<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> Values<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: StorageMapper + StorageClearable, { - fn new( - hash_map: &'a MapStorageMapper, - ) -> Values<'a, SA, StorageSCAddress, K, V> { + fn new(hash_map: &'a MapStorageMapper) -> Values<'a, SA, A, K, V> { Values { key_iter: hash_map.keys(), hash_map, @@ -302,9 +265,10 @@ where } } -impl<'a, SA, K, V> Iterator for Values<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> Iterator for Values<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, V: StorageMapper + StorageClearable, { @@ -421,9 +385,10 @@ where } } -impl<'a, SA, K, V> VacantEntry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> VacantEntry<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, V: StorageMapper + StorageClearable, { @@ -432,7 +397,14 @@ where pub fn key(&self) -> &K { &self.key } +} +impl<'a, SA, K, V> VacantEntry<'a, SA, StorageSCAddress, K, V> +where + SA: StorageMapperApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, + V: StorageMapper + StorageClearable, +{ /// Sets the value of the entry with the `VacantEntry`'s key, /// and returns an `OccupiedEntry`. pub fn insert_default(self) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { @@ -445,9 +417,10 @@ where } } -impl<'a, SA, K, V> OccupiedEntry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, A, K, V> OccupiedEntry<'a, SA, A, K, V> where SA: StorageMapperApi, + A: StorageAddress, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, V: StorageMapper + StorageClearable, { @@ -460,7 +433,14 @@ where pub fn get(&self) -> V { self.map.get(&self.key).unwrap() } +} +impl<'a, SA, K, V> OccupiedEntry<'a, SA, StorageSCAddress, K, V> +where + SA: StorageMapperApi, + K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, + V: StorageMapper + StorageClearable, +{ /// Syntactic sugar, to more compactly express a get, update and set in one line. /// Takes whatever lies in storage, apples the given closure and saves the final value back to storage. /// Propagates the return value of the given function. diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs index 817dc0867d..22b1f9b224 100644 --- a/framework/base/src/storage/mappers/queue_mapper.rs +++ b/framework/base/src/storage/mappers/queue_mapper.rs @@ -115,35 +115,10 @@ where SA: StorageMapperApi, T: TopEncode + TopDecode, { - fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey { - let mut named_key = self.base_key.clone(); - named_key.append_bytes(name); - named_key.append_item(&node_id); - named_key - } - - fn build_name_key(&self, name: &[u8]) -> StorageKey { - let mut name_key = self.base_key.clone(); - name_key.append_bytes(name); - name_key - } - - fn get_info(&self) -> QueueMapperInfo { - self.address - .address_storage_get(self.build_name_key(INFO_IDENTIFIER).as_ref()) - } - fn set_info(&mut self, value: QueueMapperInfo) { storage_set(self.build_name_key(INFO_IDENTIFIER).as_ref(), &value); } - fn get_node(&self, node_id: u32) -> Node { - self.address.address_storage_get( - self.build_node_id_named_key(NODE_IDENTIFIER, node_id) - .as_ref(), - ) - } - fn set_node(&mut self, node_id: u32, item: Node) { storage_set( self.build_node_id_named_key(NODE_IDENTIFIER, node_id) @@ -160,20 +135,6 @@ where ); } - fn get_value(&self, node_id: u32) -> T { - self.address.address_storage_get( - self.build_node_id_named_key(VALUE_IDENTIFIER, node_id) - .as_ref(), - ) - } - - fn get_value_option(&self, node_id: u32) -> Option { - if node_id == NULL_ENTRY { - return None; - } - Some(self.get_value(node_id)) - } - fn set_value(&mut self, node_id: u32, value: &T) { storage_set( self.build_node_id_named_key(VALUE_IDENTIFIER, node_id) @@ -190,20 +151,6 @@ where ) } - /// Returns `true` if the `Queue` is empty. - /// - /// This operation should compute in *O*(1) time. - pub fn is_empty(&self) -> bool { - self.get_info().len == 0 - } - - /// Returns the length of the `Queue`. - /// - /// This operation should compute in *O*(1) time. - pub fn len(&self) -> usize { - self.get_info().len as usize - } - /// Appends an element to the back of a queue /// and returns the node id of the newly added node. /// @@ -271,18 +218,6 @@ where self.set_info(info); } - /// Provides a copy to the front element, or `None` if the queue is - /// empty. - pub fn front(&self) -> Option { - self.get_value_option(self.get_info().front) - } - - /// Provides a copy to the back element, or `None` if the queue is - /// empty. - pub fn back(&self) -> Option { - self.get_value_option(self.get_info().back) - } - /// Removes the last element from a queue and returns it, or `None` if /// it is empty. /// @@ -334,88 +269,28 @@ where self.set_info(info); Some(removed_value) } +} - /// Provides a forward iterator. - pub fn iter(&self) -> Iter { - Iter::new(self) - } - - /// Runs several checks in order to verify that both forwards and backwards iteration - /// yields the same node entries and that the number of items in the queue is correct. - /// Used for unit testing. - /// - /// This operation should compute in *O*(n) time. - pub fn check_internal_consistency(&self) -> bool { - let info = self.get_info(); - let mut front = info.front; - let mut back = info.back; - if info.len == 0 { - // if the queue is empty, both ends should point to null entries - if front != NULL_ENTRY { - return false; - } - if back != NULL_ENTRY { - return false; - } - true - } else { - // if the queue is non-empty, both ends should point to non-null entries - if front == NULL_ENTRY { - return false; - } - if back == NULL_ENTRY { - return false; - } - - // the node before the first and the one after the last should both be null - if self.get_node(front).previous != NULL_ENTRY { - return false; - } - if self.get_node(back).next != NULL_ENTRY { - return false; - } - - // iterate forwards - let mut forwards = Vec::new(); - while front != NULL_ENTRY { - forwards.push(front); - front = self.get_node(front).next; - } - if forwards.len() != info.len as usize { - return false; - } - - // iterate backwards - let mut backwards = Vec::new(); - while back != NULL_ENTRY { - backwards.push(back); - back = self.get_node(back).previous; - } - if backwards.len() != info.len as usize { - return false; - } - - // check that both iterations match element-wise - let backwards_reversed: Vec = backwards.iter().rev().cloned().collect(); - if forwards != backwards_reversed { - return false; - } - - // check that the node IDs are unique - forwards.sort_unstable(); - forwards.dedup(); - if forwards.len() != info.len as usize { - return false; - } - true +impl QueueMapper> +where + SA: StorageMapperApi, + T: TopEncode + TopDecode, +{ + pub fn new_from_address(address: ManagedAddress, base_key: StorageKey) -> Self { + QueueMapper { + _phantom_api: PhantomData::, + address, + base_key: base_key.clone(), + _phantom_item: PhantomData::, } } } -impl QueueMapper> +impl QueueMapper where SA: StorageMapperApi, - T: TopEncode + TopDecode, + A: StorageAddress, + T: TopEncode + TopDecode + 'static, { fn build_node_id_named_key(&self, name: &[u8], node_id: u32) -> StorageKey { let mut named_key = self.base_key.clone(); @@ -430,13 +305,8 @@ where name_key } - pub fn new_from_address(address: ManagedAddress, base_key: StorageKey) -> Self { - QueueMapper { - _phantom_api: PhantomData::, - address, - base_key: base_key.clone(), - _phantom_item: PhantomData::, - } + pub fn iter(&self) -> Iter { + Iter::new(self) } fn get_info(&self) -> QueueMapperInfo { @@ -491,11 +361,6 @@ where self.get_value_option(self.get_info().back) } - // Provides a forward iterator. - // pub fn iter(&self) -> Iter { - // Iter::new(self) - // } - /// Runs several checks in order to verify that both forwards and backwards iteration /// yields the same node entries and that the number of items in the queue is correct. /// Used for unit testing. @@ -568,14 +433,15 @@ where } } -impl<'a, SA, T> IntoIterator for &'a QueueMapper +impl<'a, SA, A, T> IntoIterator for &'a QueueMapper where SA: StorageMapperApi, + A: StorageAddress, T: TopEncode + TopDecode + 'static, { type Item = T; - type IntoIter = Iter<'a, SA, T>; + type IntoIter = Iter<'a, SA, A, T>; fn into_iter(self) -> Self::IntoIter { self.iter() @@ -586,21 +452,23 @@ where /// /// This `struct` is created by [`QueueMapper::iter()`]. See its /// documentation for more. -pub struct Iter<'a, SA, T> +pub struct Iter<'a, SA, A, T> where SA: StorageMapperApi, + A: StorageAddress, T: TopEncode + TopDecode + 'static, { node_id: u32, - queue: &'a QueueMapper, + queue: &'a QueueMapper, } -impl<'a, SA, T> Iter<'a, SA, T> +impl<'a, SA, A, T> Iter<'a, SA, A, T> where SA: StorageMapperApi, + A: StorageAddress, T: TopEncode + TopDecode + 'static, { - fn new(queue: &'a QueueMapper) -> Iter<'a, SA, T> { + fn new(queue: &'a QueueMapper) -> Iter<'a, SA, A, T> { Iter { node_id: queue.get_info().front, queue, @@ -608,9 +476,10 @@ where } } -impl<'a, SA, T> Iterator for Iter<'a, SA, T> +impl<'a, SA, A, T> Iterator for Iter<'a, SA, A, T> where SA: StorageMapperApi, + A: StorageAddress, T: TopEncode + TopDecode + 'static, { type Item = T; diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs index 70088a6779..182e4d3b03 100644 --- a/framework/base/src/storage/mappers/set_mapper.rs +++ b/framework/base/src/storage/mappers/set_mapper.rs @@ -89,13 +89,6 @@ where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, { - pub fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey { - let mut named_key = self.base_key.clone(); - named_key.append_bytes(name); - named_key.append_item(value); - named_key - } - pub fn new_from_address(address: ManagedAddress, base_key: StorageKey) -> Self { SetMapper { _phantom_api: PhantomData, @@ -104,33 +97,6 @@ where queue_mapper: QueueMapper::new_from_address(address, base_key), } } - - fn get_node_id(&self, value: &T) -> u32 { - self.address.address_storage_get( - self.build_named_value_key(NODE_ID_IDENTIFIER, value) - .as_ref(), - ) - } - - /// Returns `true` if the set contains no elements. - pub fn is_empty(&self) -> bool { - self.queue_mapper.is_empty() - } - - /// Returns the number of elements in the set. - pub fn len(&self) -> usize { - self.queue_mapper.len() - } - - /// Returns `true` if the set contains a value. - pub fn contains(&self, value: &T) -> bool { - self.get_node_id(value) != NULL_ENTRY - } - - /// Checks the internal consistency of the collection. Used for unit tests. - pub fn check_internal_consistency(&self) -> bool { - self.queue_mapper.check_internal_consistency() - } } impl SetMapper @@ -138,13 +104,6 @@ where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, { - pub fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey { - let mut named_key = self.base_key.clone(); - named_key.append_bytes(name); - named_key.append_item(value); - named_key - } - fn set_node_id(&self, value: &T, node_id: u32) { storage_set( self.build_named_value_key(NODE_ID_IDENTIFIER, value) @@ -195,10 +154,24 @@ where self.remove(&item); } } +} + +impl SetMapper +where + SA: StorageMapperApi, + A: StorageAddress, + T: TopEncode + TopDecode + NestedEncode + NestedDecode, +{ + pub fn build_named_value_key(&self, name: &[u8], value: &T) -> StorageKey { + let mut named_key = self.base_key.clone(); + named_key.append_bytes(name); + named_key.append_item(value); + named_key + } /// An iterator visiting all elements in arbitrary order. /// The iterator element type is `&'a T`. - pub fn iter(&self) -> Iter { + pub fn iter(&self) -> Iter { self.queue_mapper.iter() } @@ -209,35 +182,36 @@ where ) } - // Returns `true` if the set contains no elements. + /// Returns `true` if the set contains a value. + pub fn contains(&self, value: &T) -> bool { + self.get_node_id(value) != NULL_ENTRY + } + + /// Returns `true` if the set contains no elements. pub fn is_empty(&self) -> bool { self.queue_mapper.is_empty() } - // Returns the number of elements in the set. + /// Returns the number of elements in the set. pub fn len(&self) -> usize { self.queue_mapper.len() } - // Returns `true` if the set contains a value. - pub fn contains(&self, value: &T) -> bool { - self.get_node_id(value) != NULL_ENTRY - } - - // Checks the internal consistency of the collection. Used for unit tests. + /// Checks the internal consistency of the collection. Used for unit tests. pub fn check_internal_consistency(&self) -> bool { self.queue_mapper.check_internal_consistency() } } -impl<'a, SA, T> IntoIterator for &'a SetMapper +impl<'a, SA, A, T> IntoIterator for &'a SetMapper where SA: StorageMapperApi, + A: StorageAddress, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, { type Item = T; - type IntoIter = Iter<'a, SA, T>; + type IntoIter = Iter<'a, SA, A, T>; fn into_iter(self) -> Self::IntoIter { self.iter() From 0f8a3801670b9035d8c3031849af3c68f8c6489f Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Tue, 23 Jan 2024 12:36:25 +0100 Subject: [PATCH 61/84] refactor from StorageSCAddress to CurrentStorage --- .../base/src/storage/mappers/map_mapper.rs | 34 +++++++++---------- .../src/storage/mappers/map_storage_mapper.rs | 24 ++++++------- .../base/src/storage/mappers/queue_mapper.rs | 18 +++++----- .../base/src/storage/mappers/set_mapper.rs | 22 ++++++------ 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/framework/base/src/storage/mappers/map_mapper.rs b/framework/base/src/storage/mappers/map_mapper.rs index 30b87f8eb7..8ed38a3c70 100644 --- a/framework/base/src/storage/mappers/map_mapper.rs +++ b/framework/base/src/storage/mappers/map_mapper.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use super::{ - set_mapper::{self, StorageAddress, StorageSCAddress}, + set_mapper::{self, CurrentStorage, StorageAddress}, SetMapper, StorageClearable, StorageMapper, }; use crate::{ @@ -18,7 +18,7 @@ use crate::{ const MAPPED_VALUE_IDENTIFIER: &[u8] = b".mapped"; type Keys<'a, SA, A, T> = set_mapper::Iter<'a, SA, A, T>; -pub struct MapMapper +pub struct MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -31,7 +31,7 @@ where _phantom_value: PhantomData, } -impl StorageMapper for MapMapper +impl StorageMapper for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -47,7 +47,7 @@ where } } -impl StorageClearable for MapMapper +impl StorageClearable for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -61,7 +61,7 @@ where } } -impl MapMapper +impl MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -356,7 +356,7 @@ where } } -impl<'a, SA, K, V> Entry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, K, V> Entry<'a, SA, CurrentStorage, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, @@ -364,7 +364,7 @@ where { /// Ensures a value is in the entry by inserting the default if empty, and returns /// an `OccupiedEntry`. - pub fn or_insert(self, default: V) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { + pub fn or_insert(self, default: V) -> OccupiedEntry<'a, SA, CurrentStorage, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert(default), @@ -376,7 +376,7 @@ where pub fn or_insert_with V>( self, default: F, - ) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { + ) -> OccupiedEntry<'a, SA, CurrentStorage, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert(default()), @@ -392,7 +392,7 @@ where pub fn or_insert_with_key V>( self, default: F, - ) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { + ) -> OccupiedEntry<'a, SA, CurrentStorage, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => { @@ -418,7 +418,7 @@ where } } -impl<'a, SA, K, V: Default> Entry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, K, V: Default> Entry<'a, SA, CurrentStorage, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, @@ -426,7 +426,7 @@ where { /// Ensures a value is in the entry by inserting the default value if empty, /// and returns an `OccupiedEntry`. - pub fn or_default(self) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { + pub fn or_default(self) -> OccupiedEntry<'a, SA, CurrentStorage, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert(Default::default()), @@ -448,7 +448,7 @@ where } } -impl<'a, SA, K, V> VacantEntry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, K, V> VacantEntry<'a, SA, CurrentStorage, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, @@ -456,7 +456,7 @@ where { /// Sets the value of the entry with the `VacantEntry`'s key, /// and returns an `OccupiedEntry`. - pub fn insert(self, value: V) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { + pub fn insert(self, value: V) -> OccupiedEntry<'a, SA, CurrentStorage, K, V> { self.map.insert(self.key.clone(), value); OccupiedEntry { key: self.key, @@ -484,7 +484,7 @@ where } } -impl<'a, SA, K, V> OccupiedEntry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, K, V> OccupiedEntry<'a, SA, CurrentStorage, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone, @@ -519,7 +519,7 @@ where } /// Behaves like a MultiResultVec> when an endpoint result. -impl TopEncodeMulti for MapMapper +impl TopEncodeMulti for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -535,7 +535,7 @@ where } } -impl CodecFrom> +impl CodecFrom> for MultiValueEncoded> where SA: StorageMapperApi, @@ -545,7 +545,7 @@ where } /// Behaves like a MultiResultVec> when an endpoint result. -impl TypeAbi for MapMapper +impl TypeAbi for MapMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi + 'static, diff --git a/framework/base/src/storage/mappers/map_storage_mapper.rs b/framework/base/src/storage/mappers/map_storage_mapper.rs index fb2ec92b1e..e19f005861 100644 --- a/framework/base/src/storage/mappers/map_storage_mapper.rs +++ b/framework/base/src/storage/mappers/map_storage_mapper.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use super::{ - set_mapper::{self, StorageAddress, StorageSCAddress}, + set_mapper::{self, CurrentStorage, StorageAddress}, SetMapper, StorageClearable, StorageMapper, }; use crate::{ @@ -14,7 +14,7 @@ use crate::{ const MAPPED_STORAGE_VALUE_IDENTIFIER: &[u8] = b".storage"; type Keys<'a, SA, A, T> = set_mapper::Iter<'a, SA, A, T>; -pub struct MapStorageMapper +pub struct MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -27,7 +27,7 @@ where _phantom_value: PhantomData, } -impl StorageMapper for MapStorageMapper +impl StorageMapper for MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -43,7 +43,7 @@ where } } -impl StorageClearable for MapStorageMapper +impl StorageClearable for MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -57,7 +57,7 @@ where } } -impl MapStorageMapper +impl MapStorageMapper where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -330,7 +330,7 @@ where pub(super) _marker: PhantomData<&'a mut (K, V)>, } -impl<'a, SA, K, V> Entry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, K, V> Entry<'a, SA, CurrentStorage, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, @@ -338,7 +338,7 @@ where { /// Ensures a value is in the entry by inserting the default if empty, and returns /// an `OccupiedEntry`. - pub fn or_insert_default(self) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { + pub fn or_insert_default(self) -> OccupiedEntry<'a, SA, CurrentStorage, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert_default(), @@ -369,7 +369,7 @@ where } } -impl<'a, SA, K, V> Entry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, K, V> Entry<'a, SA, CurrentStorage, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, @@ -377,7 +377,7 @@ where { /// Ensures a value is in the entry by inserting the default value if empty, /// and returns an `OccupiedEntry`. - pub fn or_default(self) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { + pub fn or_default(self) -> OccupiedEntry<'a, SA, CurrentStorage, K, V> { match self { Entry::Occupied(entry) => entry, Entry::Vacant(entry) => entry.insert_default(), @@ -399,7 +399,7 @@ where } } -impl<'a, SA, K, V> VacantEntry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, K, V> VacantEntry<'a, SA, CurrentStorage, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, @@ -407,7 +407,7 @@ where { /// Sets the value of the entry with the `VacantEntry`'s key, /// and returns an `OccupiedEntry`. - pub fn insert_default(self) -> OccupiedEntry<'a, SA, StorageSCAddress, K, V> { + pub fn insert_default(self) -> OccupiedEntry<'a, SA, CurrentStorage, K, V> { self.map.insert_default(self.key.clone()); OccupiedEntry { key: self.key, @@ -435,7 +435,7 @@ where } } -impl<'a, SA, K, V> OccupiedEntry<'a, SA, StorageSCAddress, K, V> +impl<'a, SA, K, V> OccupiedEntry<'a, SA, CurrentStorage, K, V> where SA: StorageMapperApi, K: TopEncode + TopDecode + NestedEncode + NestedDecode + Clone + 'static, diff --git a/framework/base/src/storage/mappers/queue_mapper.rs b/framework/base/src/storage/mappers/queue_mapper.rs index 22b1f9b224..0a20c1495a 100644 --- a/framework/base/src/storage/mappers/queue_mapper.rs +++ b/framework/base/src/storage/mappers/queue_mapper.rs @@ -1,7 +1,7 @@ use core::marker::PhantomData; use super::{ - set_mapper::{StorageAddress, StorageSCAddress}, + set_mapper::{CurrentStorage, StorageAddress}, StorageClearable, StorageMapper, }; use crate::{ @@ -65,7 +65,7 @@ impl QueueMapperInfo { /// /// The `QueueMapper` allows pushing and popping elements at either end /// in constant time. -pub struct QueueMapper +pub struct QueueMapper where SA: StorageMapperApi, A: StorageAddress, @@ -77,7 +77,7 @@ where _phantom_item: PhantomData, } -impl StorageMapper for QueueMapper +impl StorageMapper for QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode, @@ -85,14 +85,14 @@ where fn new(base_key: StorageKey) -> Self { QueueMapper { _phantom_api: PhantomData, - address: StorageSCAddress, + address: CurrentStorage, base_key, _phantom_item: PhantomData, } } } -impl StorageClearable for QueueMapper +impl StorageClearable for QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode, @@ -110,7 +110,7 @@ where } } -impl QueueMapper +impl QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode, @@ -496,7 +496,7 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TopEncodeMulti for QueueMapper +impl TopEncodeMulti for QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode, @@ -510,7 +510,7 @@ where } } -impl CodecFrom> for MultiValueEncoded +impl CodecFrom> for MultiValueEncoded where SA: StorageMapperApi, T: TopEncode + TopDecode, @@ -518,7 +518,7 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TypeAbi for QueueMapper +impl TypeAbi for QueueMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + TypeAbi, diff --git a/framework/base/src/storage/mappers/set_mapper.rs b/framework/base/src/storage/mappers/set_mapper.rs index 182e4d3b03..f8e2bab25b 100644 --- a/framework/base/src/storage/mappers/set_mapper.rs +++ b/framework/base/src/storage/mappers/set_mapper.rs @@ -24,9 +24,9 @@ where fn address_storage_get(&self, key: ManagedRef<'_, SA, StorageKey>) -> T; } -pub struct StorageSCAddress; +pub struct CurrentStorage; -impl StorageAddress for StorageSCAddress +impl StorageAddress for CurrentStorage where SA: StorageMapperApi, { @@ -44,7 +44,7 @@ where } } -pub struct SetMapper +pub struct SetMapper where SA: StorageMapperApi, A: StorageAddress, @@ -56,7 +56,7 @@ where queue_mapper: QueueMapper, } -impl StorageMapper for SetMapper +impl StorageMapper for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -64,14 +64,14 @@ where fn new(base_key: StorageKey) -> Self { SetMapper { _phantom_api: PhantomData, - address: StorageSCAddress, + address: CurrentStorage, base_key: base_key.clone(), queue_mapper: QueueMapper::new(base_key), } } } -impl StorageClearable for SetMapper +impl StorageClearable for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -99,7 +99,7 @@ where } } -impl SetMapper +impl SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode, @@ -218,7 +218,7 @@ where } } -impl Extend for SetMapper +impl Extend for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -234,7 +234,7 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TopEncodeMulti for SetMapper +impl TopEncodeMulti for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -248,7 +248,7 @@ where } } -impl CodecFrom> for MultiValueEncoded +impl CodecFrom> for MultiValueEncoded where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + 'static, @@ -256,7 +256,7 @@ where } /// Behaves like a MultiResultVec when an endpoint result. -impl TypeAbi for SetMapper +impl TypeAbi for SetMapper where SA: StorageMapperApi, T: TopEncode + TopDecode + NestedEncode + NestedDecode + TypeAbi, From 0eef8894e6c4d7db12738790d3e3557f035a4699 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Tue, 23 Jan 2024 14:09:19 +0200 Subject: [PATCH 62/84] cargo fmt --- framework/scenario/src/vm_go_tool.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/scenario/src/vm_go_tool.rs b/framework/scenario/src/vm_go_tool.rs index 8eb82a7bde..72fbb963f8 100644 --- a/framework/scenario/src/vm_go_tool.rs +++ b/framework/scenario/src/vm_go_tool.rs @@ -31,7 +31,9 @@ pub fn run_mx_scenario_go(absolute_path: &Path) { "{}", format!("Warning: `{RUNNER_TOOL_NAME}` not found. Using `{RUNNER_TOOL_NAME_LEGACY}` as fallback.").yellow(), ); - let output = Command::new(RUNNER_TOOL_NAME_LEGACY).arg(absolute_path).output(); + let output = Command::new(RUNNER_TOOL_NAME_LEGACY) + .arg(absolute_path) + .output(); if run_scenario_tool(RUNNER_TOOL_NAME_LEGACY, output).is_ok() { return; } From 7ca3f482251dedd7581605f402e1eda724ecae53 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Tue, 23 Jan 2024 14:10:03 +0200 Subject: [PATCH 63/84] sc 0.47.0, codec 0.18.4, vm 0.8.0, scenario-format 0.22.0 --- CHANGELOG.md | 9 +++++++ Cargo.lock | 26 +++++++++---------- contracts/benchmarks/large-storage/Cargo.toml | 4 +-- .../benchmarks/large-storage/meta/Cargo.toml | 2 +- .../benchmarks/large-storage/wasm/Cargo.toml | 2 +- .../mappers/benchmark-common/Cargo.toml | 4 +-- .../mappers/linked-list-repeat/Cargo.toml | 4 +-- .../linked-list-repeat/meta/Cargo.toml | 2 +- .../linked-list-repeat/wasm/Cargo.toml | 2 +- .../benchmarks/mappers/map-repeat/Cargo.toml | 4 +-- .../mappers/map-repeat/meta/Cargo.toml | 2 +- .../mappers/map-repeat/wasm/Cargo.toml | 2 +- .../mappers/queue-repeat/Cargo.toml | 4 +-- .../mappers/queue-repeat/meta/Cargo.toml | 2 +- .../mappers/queue-repeat/wasm/Cargo.toml | 2 +- .../benchmarks/mappers/set-repeat/Cargo.toml | 4 +-- .../mappers/set-repeat/meta/Cargo.toml | 2 +- .../mappers/set-repeat/wasm/Cargo.toml | 2 +- .../mappers/single-value-repeat/Cargo.toml | 4 +-- .../single-value-repeat/meta/Cargo.toml | 2 +- .../single-value-repeat/wasm/Cargo.toml | 2 +- .../benchmarks/mappers/vec-repeat/Cargo.toml | 4 +-- .../mappers/vec-repeat/meta/Cargo.toml | 2 +- .../mappers/vec-repeat/wasm/Cargo.toml | 2 +- .../benchmarks/send-tx-repeat/Cargo.toml | 4 +-- .../benchmarks/send-tx-repeat/meta/Cargo.toml | 2 +- .../benchmarks/send-tx-repeat/wasm/Cargo.toml | 2 +- contracts/benchmarks/str-repeat/Cargo.toml | 4 +-- .../benchmarks/str-repeat/meta/Cargo.toml | 2 +- .../benchmarks/str-repeat/wasm/Cargo.toml | 2 +- contracts/core/price-aggregator/Cargo.toml | 8 +++--- .../core/price-aggregator/meta/Cargo.toml | 4 +-- .../core/price-aggregator/wasm/Cargo.toml | 2 +- contracts/core/wegld-swap/Cargo.toml | 8 +++--- contracts/core/wegld-swap/meta/Cargo.toml | 4 +-- contracts/core/wegld-swap/wasm/Cargo.toml | 2 +- contracts/examples/adder/Cargo.toml | 4 +-- contracts/examples/adder/interact/Cargo.toml | 2 +- contracts/examples/adder/meta/Cargo.toml | 2 +- contracts/examples/adder/wasm/Cargo.toml | 2 +- .../bonding-curve-contract/Cargo.toml | 6 ++--- .../bonding-curve-contract/meta/Cargo.toml | 2 +- .../bonding-curve-contract/wasm/Cargo.toml | 2 +- contracts/examples/check-pause/Cargo.toml | 6 ++--- .../examples/check-pause/meta/Cargo.toml | 2 +- .../examples/check-pause/wasm/Cargo.toml | 2 +- .../examples/crowdfunding-esdt/Cargo.toml | 4 +-- .../crowdfunding-esdt/meta/Cargo.toml | 2 +- .../crowdfunding-esdt/wasm/Cargo.toml | 2 +- contracts/examples/crypto-bubbles/Cargo.toml | 4 +-- .../examples/crypto-bubbles/meta/Cargo.toml | 2 +- .../examples/crypto-bubbles/wasm/Cargo.toml | 2 +- .../crypto-kitties/common/kitty/Cargo.toml | 2 +- .../crypto-kitties/common/random/Cargo.toml | 2 +- .../crypto-kitties/kitty-auction/Cargo.toml | 4 +-- .../kitty-auction/meta/Cargo.toml | 2 +- .../kitty-auction/wasm/Cargo.toml | 2 +- .../kitty-genetic-alg/Cargo.toml | 4 +-- .../kitty-genetic-alg/meta/Cargo.toml | 2 +- .../kitty-genetic-alg/wasm/Cargo.toml | 2 +- .../crypto-kitties/kitty-ownership/Cargo.toml | 4 +-- .../kitty-ownership/meta/Cargo.toml | 2 +- .../kitty-ownership/wasm/Cargo.toml | 2 +- contracts/examples/crypto-zombies/Cargo.toml | 4 +-- .../examples/crypto-zombies/meta/Cargo.toml | 2 +- .../examples/crypto-zombies/wasm/Cargo.toml | 2 +- contracts/examples/digital-cash/Cargo.toml | 4 +-- .../examples/digital-cash/meta/Cargo.toml | 2 +- .../examples/digital-cash/wasm/Cargo.toml | 2 +- contracts/examples/empty/Cargo.toml | 4 +-- contracts/examples/empty/meta/Cargo.toml | 2 +- contracts/examples/empty/wasm/Cargo.toml | 2 +- .../esdt-transfer-with-fee/Cargo.toml | 4 +-- .../esdt-transfer-with-fee/meta/Cargo.toml | 2 +- .../esdt-transfer-with-fee/wasm/Cargo.toml | 2 +- contracts/examples/factorial/Cargo.toml | 4 +-- contracts/examples/factorial/meta/Cargo.toml | 2 +- contracts/examples/factorial/wasm/Cargo.toml | 2 +- contracts/examples/fractional-nfts/Cargo.toml | 6 ++--- .../examples/fractional-nfts/meta/Cargo.toml | 2 +- .../examples/fractional-nfts/wasm/Cargo.toml | 2 +- contracts/examples/lottery-esdt/Cargo.toml | 4 +-- .../examples/lottery-esdt/meta/Cargo.toml | 2 +- .../examples/lottery-esdt/wasm/Cargo.toml | 2 +- contracts/examples/multisig/Cargo.toml | 8 +++--- .../examples/multisig/interact/Cargo.toml | 6 ++--- contracts/examples/multisig/meta/Cargo.toml | 2 +- .../multisig/wasm-multisig-full/Cargo.toml | 2 +- .../multisig/wasm-multisig-view/Cargo.toml | 2 +- contracts/examples/multisig/wasm/Cargo.toml | 2 +- contracts/examples/nft-minter/Cargo.toml | 4 +-- contracts/examples/nft-minter/meta/Cargo.toml | 2 +- contracts/examples/nft-minter/wasm/Cargo.toml | 2 +- .../examples/nft-storage-prepay/Cargo.toml | 4 +-- .../nft-storage-prepay/meta/Cargo.toml | 2 +- .../nft-storage-prepay/wasm/Cargo.toml | 2 +- .../examples/nft-subscription/Cargo.toml | 6 ++--- .../examples/nft-subscription/meta/Cargo.toml | 2 +- .../examples/nft-subscription/wasm/Cargo.toml | 2 +- .../examples/order-book/factory/Cargo.toml | 4 +-- .../order-book/factory/meta/Cargo.toml | 2 +- .../order-book/factory/wasm/Cargo.toml | 2 +- contracts/examples/order-book/pair/Cargo.toml | 4 +-- .../examples/order-book/pair/meta/Cargo.toml | 2 +- .../examples/order-book/pair/wasm/Cargo.toml | 2 +- contracts/examples/ping-pong-egld/Cargo.toml | 4 +-- .../examples/ping-pong-egld/meta/Cargo.toml | 2 +- .../examples/ping-pong-egld/wasm/Cargo.toml | 2 +- contracts/examples/proxy-pause/Cargo.toml | 4 +-- .../examples/proxy-pause/meta/Cargo.toml | 2 +- .../examples/proxy-pause/wasm/Cargo.toml | 2 +- .../examples/rewards-distribution/Cargo.toml | 6 ++--- .../rewards-distribution/meta/Cargo.toml | 2 +- .../rewards-distribution/wasm/Cargo.toml | 2 +- contracts/examples/seed-nft-minter/Cargo.toml | 6 ++--- .../examples/seed-nft-minter/meta/Cargo.toml | 2 +- .../examples/seed-nft-minter/wasm/Cargo.toml | 2 +- contracts/examples/token-release/Cargo.toml | 4 +-- .../examples/token-release/meta/Cargo.toml | 2 +- .../examples/token-release/wasm/Cargo.toml | 2 +- contracts/feature-tests/abi-tester/Cargo.toml | 6 ++--- .../abi_tester_expected_main.abi.json | 2 +- .../abi_tester_expected_view.abi.json | 2 +- .../feature-tests/abi-tester/meta/Cargo.toml | 2 +- .../abi-tester/wasm-abi-tester-ev/Cargo.toml | 2 +- .../feature-tests/abi-tester/wasm/Cargo.toml | 2 +- .../feature-tests/alloc-features/Cargo.toml | 4 +-- .../alloc-features/meta/Cargo.toml | 2 +- .../alloc-features/wasm/Cargo.toml | 2 +- .../feature-tests/basic-features/Cargo.toml | 6 ++--- .../basic-features/interact/Cargo.toml | 2 +- .../basic-features/meta/Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../basic-features/wasm/Cargo.toml | 2 +- .../big-float-features/Cargo.toml | 4 +-- .../big-float-features/meta/Cargo.toml | 2 +- .../big-float-features/wasm/Cargo.toml | 2 +- .../feature-tests/composability/Cargo.toml | 4 +-- .../builtin-func-features/Cargo.toml | 4 +-- .../builtin-func-features/meta/Cargo.toml | 2 +- .../builtin-func-features/wasm/Cargo.toml | 2 +- .../esdt-contract-pair/Cargo.toml | 4 +-- .../first-contract/Cargo.toml | 4 +-- .../first-contract/meta/Cargo.toml | 4 +-- .../first-contract/wasm/Cargo.toml | 2 +- .../second-contract/Cargo.toml | 4 +-- .../second-contract/meta/Cargo.toml | 4 +-- .../second-contract/wasm/Cargo.toml | 2 +- .../Cargo.toml | 4 +-- .../child/Cargo.toml | 4 +-- .../child/meta/Cargo.toml | 4 +-- .../child/wasm/Cargo.toml | 2 +- .../parent/Cargo.toml | 4 +-- .../parent/meta/Cargo.toml | 4 +-- .../parent/wasm/Cargo.toml | 2 +- .../composability/forwarder-queue/Cargo.toml | 6 ++--- .../forwarder-queue/meta/Cargo.toml | 2 +- .../wasm-forwarder-queue-promises/Cargo.toml | 2 +- .../forwarder-queue/wasm/Cargo.toml | 2 +- .../composability/forwarder-raw/Cargo.toml | 4 +-- .../forwarder-raw/meta/Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../forwarder-raw/wasm/Cargo.toml | 2 +- .../composability/forwarder/Cargo.toml | 4 +-- .../composability/forwarder/meta/Cargo.toml | 2 +- .../composability/forwarder/wasm/Cargo.toml | 2 +- .../composability/interact/Cargo.toml | 4 +-- .../local-esdt-and-nft/Cargo.toml | 4 +-- .../local-esdt-and-nft/meta/Cargo.toml | 2 +- .../local-esdt-and-nft/wasm/Cargo.toml | 2 +- .../promises-features/Cargo.toml | 2 +- .../promises-features/meta/Cargo.toml | 2 +- .../promises-features/wasm/Cargo.toml | 2 +- .../composability/proxy-test-first/Cargo.toml | 4 +-- .../proxy-test-first/meta/Cargo.toml | 2 +- .../proxy-test-first/wasm/Cargo.toml | 2 +- .../proxy-test-second/Cargo.toml | 4 +-- .../proxy-test-second/meta/Cargo.toml | 2 +- .../proxy-test-second/wasm/Cargo.toml | 2 +- .../composability/recursive-caller/Cargo.toml | 4 +-- .../recursive-caller/meta/Cargo.toml | 2 +- .../recursive-caller/wasm/Cargo.toml | 2 +- .../transfer-role-features/Cargo.toml | 6 ++--- .../transfer-role-features/meta/Cargo.toml | 2 +- .../transfer-role-features/wasm/Cargo.toml | 2 +- .../composability/vault/Cargo.toml | 4 +-- .../composability/vault/meta/Cargo.toml | 2 +- .../vault/wasm-vault-promises/Cargo.toml | 2 +- .../vault/wasm-vault-upgrade/Cargo.toml | 2 +- .../composability/vault/wasm/Cargo.toml | 2 +- .../crowdfunding-erc20/Cargo.toml | 4 +-- .../crowdfunding-erc20/meta/Cargo.toml | 2 +- .../crowdfunding-erc20/wasm/Cargo.toml | 2 +- .../erc1155-marketplace/Cargo.toml | 4 +-- .../erc1155-marketplace/meta/Cargo.toml | 2 +- .../erc1155-marketplace/wasm/Cargo.toml | 2 +- .../erc1155-user-mock/Cargo.toml | 4 +-- .../erc1155-user-mock/meta/Cargo.toml | 2 +- .../erc1155-user-mock/wasm/Cargo.toml | 2 +- .../erc-style-contracts/erc1155/Cargo.toml | 4 +-- .../erc1155/meta/Cargo.toml | 2 +- .../erc1155/wasm/Cargo.toml | 2 +- .../erc-style-contracts/erc20/Cargo.toml | 4 +-- .../erc-style-contracts/erc20/meta/Cargo.toml | 2 +- .../erc-style-contracts/erc20/wasm/Cargo.toml | 2 +- .../erc-style-contracts/erc721/Cargo.toml | 4 +-- .../erc721/meta/Cargo.toml | 2 +- .../erc721/wasm/Cargo.toml | 2 +- .../lottery-erc20/Cargo.toml | 4 +-- .../lottery-erc20/meta/Cargo.toml | 2 +- .../lottery-erc20/wasm/Cargo.toml | 2 +- .../esdt-system-sc-mock/Cargo.toml | 4 +-- .../esdt-system-sc-mock/meta/Cargo.toml | 2 +- .../esdt-system-sc-mock/wasm/Cargo.toml | 2 +- .../formatted-message-features/Cargo.toml | 4 +-- .../meta/Cargo.toml | 2 +- .../wasm/Cargo.toml | 2 +- .../managed-map-features/Cargo.toml | 4 +-- .../managed-map-features/meta/Cargo.toml | 2 +- .../managed-map-features/wasm/Cargo.toml | 2 +- .../multi-contract-features/Cargo.toml | 4 +-- .../multi-contract-features/meta/Cargo.toml | 2 +- .../wasm-multi-contract-alt-impl/Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../multi-contract-features/wasm/Cargo.toml | 2 +- .../panic-message-features/Cargo.toml | 4 +-- .../panic-message-features/meta/Cargo.toml | 2 +- .../panic-message-features/wasm/Cargo.toml | 2 +- .../feature-tests/payable-features/Cargo.toml | 4 +-- .../payable-features/meta/Cargo.toml | 2 +- .../payable-features/wasm/Cargo.toml | 2 +- .../rust-snippets-generator-test/Cargo.toml | 4 +-- .../interact-rs/Cargo.toml | 2 +- .../meta/Cargo.toml | 2 +- .../rust-snippets-generator-test/src/lib.rs | 2 +- .../wasm/Cargo.toml | 2 +- .../rust-testing-framework-tester/Cargo.toml | 4 +-- .../meta/Cargo.toml | 2 +- .../wasm/Cargo.toml | 2 +- contracts/feature-tests/use-module/Cargo.toml | 8 +++--- .../feature-tests/use-module/meta/Cargo.toml | 2 +- .../use-module/meta/abi/Cargo.toml | 4 +-- .../use_module_expected_main.abi.json | 2 +- .../use_module_expected_view.abi.json | 2 +- .../wasm-use-module-view/Cargo.toml | 2 +- .../feature-tests/use-module/wasm/Cargo.toml | 2 +- contracts/modules/Cargo.toml | 4 +-- data/codec-derive/Cargo.toml | 2 +- data/codec/Cargo.toml | 6 ++--- framework/base/Cargo.toml | 6 ++--- framework/derive/Cargo.toml | 2 +- framework/meta/Cargo.toml | 4 +-- .../generate_snippets/snippet_crate_gen.rs | 2 +- .../meta/src/cmd/contract/meta_config.rs | 4 +-- framework/meta/src/version_history.rs | 6 +++-- framework/scenario/Cargo.toml | 10 +++---- framework/snippets/Cargo.toml | 4 +-- framework/wasm-adapter/Cargo.toml | 4 +-- sdk/scenario-format/Cargo.toml | 2 +- tools/mxpy-snippet-generator/Cargo.toml | 2 +- tools/rust-debugger/format-tests/Cargo.toml | 6 ++--- vm/Cargo.toml | 2 +- 264 files changed, 405 insertions(+), 394 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d9dcae087..fc55f09086 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,15 @@ They are: - `multiversx-chain-scenario-format`, in short `scenario-format`, scenario JSON serializer/deserializer, 1 crate. - `multiversx-sdk`, in short `sdk`, allows communication with the chain(s), 1 crate. +## [sc 0.47.0, codec 0.18.4, vm 0.8.0, scenario-format 0.22.0] - 2024-01-23 +- Added support for the code metadata in the Rust VM and Rust scenarios backend. +- `sc-meta`: + - New `mx-scenario-go` installer; + - `--nocapture` flag added in `sc-meta test` CLI; + - Framework version system refactor, +- `SetMapper` and `QueueMapper` can read from another contract. +- Fixed an edge case when generating enum encoding. + ## [sc 0.46.1] - 2024-01-10 - Interactor: fixed parsing of newly issued token identifier. diff --git a/Cargo.lock b/Cargo.lock index c368983e50..08de40abae 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -1769,7 +1769,7 @@ dependencies = [ [[package]] name = "multiversx-chain-scenario-format" -version = "0.21.1" +version = "0.22.0" dependencies = [ "bech32", "hex", @@ -1782,7 +1782,7 @@ dependencies = [ [[package]] name = "multiversx-chain-vm" -version = "0.7.1" +version = "0.8.0" dependencies = [ "bitflags 2.4.1", "ed25519-dalek", @@ -1806,7 +1806,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f" [[package]] name = "multiversx-price-aggregator-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "arrayvec", "getrandom", @@ -1827,7 +1827,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags 2.4.1", "hex-literal", @@ -1838,7 +1838,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -1847,7 +1847,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -1857,7 +1857,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -1868,7 +1868,7 @@ dependencies = [ [[package]] name = "multiversx-sc-meta" -version = "0.46.1" +version = "0.47.0" dependencies = [ "clap", "colored", @@ -1894,14 +1894,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-scenario" -version = "0.46.1" +version = "0.47.0" dependencies = [ "base64", "bech32", @@ -1927,7 +1927,7 @@ dependencies = [ [[package]] name = "multiversx-sc-snippets" -version = "0.46.1" +version = "0.47.0" dependencies = [ "base64", "env_logger", @@ -1941,7 +1941,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -1972,7 +1972,7 @@ dependencies = [ [[package]] name = "multiversx-wegld-swap-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", "multiversx-sc-modules", diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml index 616e4a4aa9..4eb422079e 100644 --- a/contracts/benchmarks/large-storage/Cargo.toml +++ b/contracts/benchmarks/large-storage/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/large_storage.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml index e1825f7996..212070f5fb 100644 --- a/contracts/benchmarks/large-storage/meta/Cargo.toml +++ b/contracts/benchmarks/large-storage/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml index 8228e7662f..b8517c59c7 100644 --- a/contracts/benchmarks/large-storage/wasm/Cargo.toml +++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml index deb18f54c0..f71573b94a 100644 --- a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml +++ b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml index 011f6a1d18..91e0b8cedd 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml index d49df9aeba..855accebf6 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml index 51d18fad4b..fb5e9fcba1 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml index a1c62a5428..354a616359 100644 --- a/contracts/benchmarks/mappers/map-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/map-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml index 4763e21ab5..751fbbd6e3 100644 --- a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml index de90d27a20..248cbcb80f 100644 --- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml index 79e2227247..6741b087e5 100644 --- a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml index 8eac576d3e..366fdc07c8 100644 --- a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml index ad801d723b..184d4cf172 100644 --- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml index 0e7d4596c7..e5b5d067e1 100644 --- a/contracts/benchmarks/mappers/set-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/set-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml index 0f86849de3..b386b7da9b 100644 --- a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml index f2d76867de..0596bc371f 100644 --- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml index 87e530d256..fedf9e5ac0 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml index a73b25c35d..67adcf3296 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml index ccd3360305..900facc16c 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml index c4da5ccdfd..34cefe4970 100644 --- a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml index dc768d71c8..45672d0c85 100644 --- a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml index 6f49d499b8..aaf28c7ccd 100644 --- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml index dc13322fb8..05688e2b0a 100644 --- a/contracts/benchmarks/send-tx-repeat/Cargo.toml +++ b/contracts/benchmarks/send-tx-repeat/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/send_tx_repeat.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml index 5683b9bf84..18c89c9b18 100644 --- a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml index 2a0b54cc9c..2870403402 100644 --- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml index 1b2418fee9..fd64d75686 100644 --- a/contracts/benchmarks/str-repeat/Cargo.toml +++ b/contracts/benchmarks/str-repeat/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/str_repeat.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml index d4d268d2dd..4de99cf57b 100644 --- a/contracts/benchmarks/str-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/str-repeat/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml index 5ffbe9738a..7366900e9f 100644 --- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml index 294d8cf640..0c8baadd9c 100644 --- a/contracts/core/price-aggregator/Cargo.toml +++ b/contracts/core/price-aggregator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-price-aggregator-sc" -version = "0.46.1" +version = "0.47.0" authors = [ "Claudiu-Marcel Bruda ", "MultiversX ", @@ -19,15 +19,15 @@ edition = "2021" path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dependencies] diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml index 1a2a9591a5..0b56f9652c 100644 --- a/contracts/core/price-aggregator/meta/Cargo.toml +++ b/contracts/core/price-aggregator/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml index ddfa805307..a8ee7b4c89 100644 --- a/contracts/core/price-aggregator/wasm/Cargo.toml +++ b/contracts/core/price-aggregator/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml index 50bb126f86..997ec92580 100644 --- a/contracts/core/wegld-swap/Cargo.toml +++ b/contracts/core/wegld-swap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-wegld-swap-sc" -version = "0.46.1" +version = "0.47.0" authors = [ "Dorin Iancu ", @@ -20,13 +20,13 @@ edition = "2021" path = "src/wegld.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml index 75a5b34182..f04026c742 100644 --- a/contracts/core/wegld-swap/meta/Cargo.toml +++ b/contracts/core/wegld-swap/meta/Cargo.toml @@ -11,10 +11,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml index 21b157d302..d5d6c93252 100644 --- a/contracts/core/wegld-swap/wasm/Cargo.toml +++ b/contracts/core/wegld-swap/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml index a7f6eabe69..10ac753532 100644 --- a/contracts/examples/adder/Cargo.toml +++ b/contracts/examples/adder/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/adder.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml index 8a95fb0248..382a47700f 100644 --- a/contracts/examples/adder/interact/Cargo.toml +++ b/contracts/examples/adder/interact/Cargo.toml @@ -18,5 +18,5 @@ toml = "0.8.6" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/snippets" diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml index da86deb2ab..1ceef37f98 100644 --- a/contracts/examples/adder/meta/Cargo.toml +++ b/contracts/examples/adder/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml index 8b4e884edd..90450ca2fe 100644 --- a/contracts/examples/adder/wasm/Cargo.toml +++ b/contracts/examples/adder/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml index b553a1c8d9..54128edd77 100644 --- a/contracts/examples/bonding-curve-contract/Cargo.toml +++ b/contracts/examples/bonding-curve-contract/Cargo.toml @@ -9,14 +9,14 @@ publish = false path = "src/bonding_curve_contract.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml index fd4151e114..dc40de2cc4 100644 --- a/contracts/examples/bonding-curve-contract/meta/Cargo.toml +++ b/contracts/examples/bonding-curve-contract/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml index bda3731c13..e1513dd0e3 100644 --- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml +++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml index dd297827fe..a2b509d789 100644 --- a/contracts/examples/check-pause/Cargo.toml +++ b/contracts/examples/check-pause/Cargo.toml @@ -12,14 +12,14 @@ path = "src/check_pause.rs" num-bigint = "0.4" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml index 24da55db06..377b49534a 100644 --- a/contracts/examples/check-pause/meta/Cargo.toml +++ b/contracts/examples/check-pause/meta/Cargo.toml @@ -9,6 +9,6 @@ authors = ["Alin Cruceat "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml index 21bfd086a0..b4e6752123 100644 --- a/contracts/examples/check-pause/wasm/Cargo.toml +++ b/contracts/examples/check-pause/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml index f18e6854d9..26dac5a965 100644 --- a/contracts/examples/crowdfunding-esdt/Cargo.toml +++ b/contracts/examples/crowdfunding-esdt/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/crowdfunding_esdt.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dev-dependencies] diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml index 8fb9bcd423..fd153f9488 100644 --- a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml +++ b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml index a6dac769e1..866f535305 100644 --- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml +++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml index cc1d7744b9..31c0b5dec2 100644 --- a/contracts/examples/crypto-bubbles/Cargo.toml +++ b/contracts/examples/crypto-bubbles/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/crypto_bubbles.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml index 67534658b5..2c47928aa5 100644 --- a/contracts/examples/crypto-bubbles/meta/Cargo.toml +++ b/contracts/examples/crypto-bubbles/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml index 808699992d..cafdfc3dae 100644 --- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml +++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-kitties/common/kitty/Cargo.toml b/contracts/examples/crypto-kitties/common/kitty/Cargo.toml index 7e528d577e..18ae686d28 100644 --- a/contracts/examples/crypto-kitties/common/kitty/Cargo.toml +++ b/contracts/examples/crypto-kitties/common/kitty/Cargo.toml @@ -9,7 +9,7 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/base" [dependencies.random] diff --git a/contracts/examples/crypto-kitties/common/random/Cargo.toml b/contracts/examples/crypto-kitties/common/random/Cargo.toml index 39b6d766e5..0bb169dea4 100644 --- a/contracts/examples/crypto-kitties/common/random/Cargo.toml +++ b/contracts/examples/crypto-kitties/common/random/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/base" diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml index 241510001e..e8a40b1c87 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml @@ -17,9 +17,9 @@ version = "0.0.0" path = "../kitty-ownership" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml index b4428e3811..4d3dbaedf7 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml index cf220dd031..2497ff3db8 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml index eaad664db8..c33e950ff8 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml @@ -18,9 +18,9 @@ version = "0.0.0" path = "../common/random" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml index da1806d6dc..3043e6412b 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml index 24e9f3137f..d1875bd6e7 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml index 2d175a06b1..6190193ffa 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml @@ -21,9 +21,9 @@ version = "0.0.0" path = "../kitty-genetic-alg" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml index 249f0fb633..8e5b96c38f 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml index 85c4f8554f..589d3dd1cd 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml index a251101033..5d60b29d79 100644 --- a/contracts/examples/crypto-zombies/Cargo.toml +++ b/contracts/examples/crypto-zombies/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml index 7ad5efebe7..dfb35656b5 100644 --- a/contracts/examples/crypto-zombies/meta/Cargo.toml +++ b/contracts/examples/crypto-zombies/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml index a22fa1734a..a373510e98 100644 --- a/contracts/examples/crypto-zombies/wasm/Cargo.toml +++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml index 1adf0a5682..283d4dda3d 100644 --- a/contracts/examples/digital-cash/Cargo.toml +++ b/contracts/examples/digital-cash/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/digital_cash.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml index d1dcf286b8..bdcf495260 100644 --- a/contracts/examples/digital-cash/meta/Cargo.toml +++ b/contracts/examples/digital-cash/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml index 44f82033d5..adc9a33145 100644 --- a/contracts/examples/digital-cash/wasm/Cargo.toml +++ b/contracts/examples/digital-cash/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml index 537ed4bd4c..45a4d65752 100644 --- a/contracts/examples/empty/Cargo.toml +++ b/contracts/examples/empty/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/empty.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dev-dependencies] diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml index 91ff306727..8bdcec3371 100644 --- a/contracts/examples/empty/meta/Cargo.toml +++ b/contracts/examples/empty/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml index ffa9bcd8ce..90e97296a9 100644 --- a/contracts/examples/empty/wasm/Cargo.toml +++ b/contracts/examples/empty/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/esdt-transfer-with-fee/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/Cargo.toml index 791bbe437d..561f281195 100644 --- a/contracts/examples/esdt-transfer-with-fee/Cargo.toml +++ b/contracts/examples/esdt-transfer-with-fee/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/esdt_transfer_with_fee.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml index d843ec3b77..0533600a58 100644 --- a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml +++ b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml index a30a4a19bd..1ec62546f0 100644 --- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml +++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml index f907a0a2ff..4f638efb95 100644 --- a/contracts/examples/factorial/Cargo.toml +++ b/contracts/examples/factorial/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/factorial.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml index 1b22f34de0..ee8ecd5819 100644 --- a/contracts/examples/factorial/meta/Cargo.toml +++ b/contracts/examples/factorial/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml index 9b6f25697b..adb6375804 100644 --- a/contracts/examples/factorial/wasm/Cargo.toml +++ b/contracts/examples/factorial/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml index 71d6992524..19235c4369 100644 --- a/contracts/examples/fractional-nfts/Cargo.toml +++ b/contracts/examples/fractional-nfts/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/fractional_nfts.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml index d162b6b6f6..0bedf88f4c 100644 --- a/contracts/examples/fractional-nfts/meta/Cargo.toml +++ b/contracts/examples/fractional-nfts/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml index b49d51c6df..4cfe31f483 100644 --- a/contracts/examples/fractional-nfts/wasm/Cargo.toml +++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml index ab90dd3620..229de9331e 100644 --- a/contracts/examples/lottery-esdt/Cargo.toml +++ b/contracts/examples/lottery-esdt/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lottery.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml index f1d406cac3..d36e112024 100644 --- a/contracts/examples/lottery-esdt/meta/Cargo.toml +++ b/contracts/examples/lottery-esdt/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml index 450e70f182..ece6134cec 100644 --- a/contracts/examples/lottery-esdt/wasm/Cargo.toml +++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml index 97fa928c50..a631aeb8be 100644 --- a/contracts/examples/multisig/Cargo.toml +++ b/contracts/examples/multisig/Cargo.toml @@ -9,15 +9,15 @@ publish = false path = "src/multisig.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dev-dependencies.adder] @@ -27,7 +27,7 @@ path = "../adder" path = "../factorial" [dev-dependencies.multiversx-wegld-swap-sc] -version = "0.46.1" +version = "0.47.0" path = "../../core/wegld-swap" [dev-dependencies] diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml index bd4732c608..5d8c502351 100644 --- a/contracts/examples/multisig/interact/Cargo.toml +++ b/contracts/examples/multisig/interact/Cargo.toml @@ -18,13 +18,13 @@ toml = "0.8.6" path = ".." [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../../contracts/modules" [dependencies.multiversx-sc-snippets] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/snippets" [dependencies.multiversx-sc-scenario] -version = "=0.46.1" +version = "=0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml index a3e66f60af..253a8b946d 100644 --- a/contracts/examples/multisig/meta/Cargo.toml +++ b/contracts/examples/multisig/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml index d1efc0a4db..a51a5e375b 100644 --- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml +++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml index 1b277ddfb7..0f80fbda5a 100644 --- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml +++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml index 8d2391d13d..06471ed0c9 100644 --- a/contracts/examples/multisig/wasm/Cargo.toml +++ b/contracts/examples/multisig/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml index 21238c553e..f1dbfa0382 100644 --- a/contracts/examples/nft-minter/Cargo.toml +++ b/contracts/examples/nft-minter/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml index cb17d26f6c..789c7bf944 100644 --- a/contracts/examples/nft-minter/meta/Cargo.toml +++ b/contracts/examples/nft-minter/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml index 1befc72add..af5994790f 100644 --- a/contracts/examples/nft-minter/wasm/Cargo.toml +++ b/contracts/examples/nft-minter/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml index 89aa8971e3..eca34af3fb 100644 --- a/contracts/examples/nft-storage-prepay/Cargo.toml +++ b/contracts/examples/nft-storage-prepay/Cargo.toml @@ -10,9 +10,9 @@ path = "src/nft_storage_prepay.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml index b97f5bdced..a04ae2179e 100644 --- a/contracts/examples/nft-storage-prepay/meta/Cargo.toml +++ b/contracts/examples/nft-storage-prepay/meta/Cargo.toml @@ -11,6 +11,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml index ce4ca239fe..0bd8a131ae 100644 --- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml +++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml index 389b6727e2..13da7207cc 100644 --- a/contracts/examples/nft-subscription/Cargo.toml +++ b/contracts/examples/nft-subscription/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml index 60b1af5068..dff391a7dd 100644 --- a/contracts/examples/nft-subscription/meta/Cargo.toml +++ b/contracts/examples/nft-subscription/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml index e3834dfb65..1522cd97cb 100644 --- a/contracts/examples/nft-subscription/wasm/Cargo.toml +++ b/contracts/examples/nft-subscription/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml index 2263959005..a77308f2a9 100644 --- a/contracts/examples/order-book/factory/Cargo.toml +++ b/contracts/examples/order-book/factory/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml index a0ce1ce88c..9d2e4c3409 100644 --- a/contracts/examples/order-book/factory/meta/Cargo.toml +++ b/contracts/examples/order-book/factory/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml index 2fba463c57..4d5f9a1497 100644 --- a/contracts/examples/order-book/factory/wasm/Cargo.toml +++ b/contracts/examples/order-book/factory/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml index 98a2d6cd8b..9aab909043 100644 --- a/contracts/examples/order-book/pair/Cargo.toml +++ b/contracts/examples/order-book/pair/Cargo.toml @@ -8,9 +8,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml index 040e647433..9e35bb8bb9 100644 --- a/contracts/examples/order-book/pair/meta/Cargo.toml +++ b/contracts/examples/order-book/pair/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml index b34a58683b..defbec9af5 100644 --- a/contracts/examples/order-book/pair/wasm/Cargo.toml +++ b/contracts/examples/order-book/pair/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml index 25613e64c2..5d7c834856 100644 --- a/contracts/examples/ping-pong-egld/Cargo.toml +++ b/contracts/examples/ping-pong-egld/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/ping_pong.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml index 16c6aea5c0..1b568fea0b 100644 --- a/contracts/examples/ping-pong-egld/meta/Cargo.toml +++ b/contracts/examples/ping-pong-egld/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml index 023c891956..80c1a8a803 100644 --- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml +++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml index 7d39859b34..02e7cb0b03 100644 --- a/contracts/examples/proxy-pause/Cargo.toml +++ b/contracts/examples/proxy-pause/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/proxy_pause.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dev-dependencies.check-pause] diff --git a/contracts/examples/proxy-pause/meta/Cargo.toml b/contracts/examples/proxy-pause/meta/Cargo.toml index 32e1ce4833..6eb3d10b26 100644 --- a/contracts/examples/proxy-pause/meta/Cargo.toml +++ b/contracts/examples/proxy-pause/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = [ "you",] path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml index c020d87b3c..1d23782876 100644 --- a/contracts/examples/proxy-pause/wasm/Cargo.toml +++ b/contracts/examples/proxy-pause/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml index 25029a5c99..f2fd448ff4 100644 --- a/contracts/examples/rewards-distribution/Cargo.toml +++ b/contracts/examples/rewards-distribution/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/rewards_distribution.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml index 5b3508d378..898d9d56ef 100644 --- a/contracts/examples/rewards-distribution/meta/Cargo.toml +++ b/contracts/examples/rewards-distribution/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = ["Claudiu-Marcel Bruda "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml index 68c12fe80b..c37d092be5 100644 --- a/contracts/examples/rewards-distribution/wasm/Cargo.toml +++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml index 4a26325d1b..de6068c57c 100644 --- a/contracts/examples/seed-nft-minter/Cargo.toml +++ b/contracts/examples/seed-nft-minter/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/seed_nft_minter.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml index a253203454..db0b4cc3c4 100644 --- a/contracts/examples/seed-nft-minter/meta/Cargo.toml +++ b/contracts/examples/seed-nft-minter/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = ["Claudiu-Marcel Bruda "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml index bb8e2dc0db..78cfa0619d 100644 --- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml +++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml index 0458a49ddd..663a0360f2 100644 --- a/contracts/examples/token-release/Cargo.toml +++ b/contracts/examples/token-release/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/token_release.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml index 61cda75c98..c7be81bde0 100644 --- a/contracts/examples/token-release/meta/Cargo.toml +++ b/contracts/examples/token-release/meta/Cargo.toml @@ -10,7 +10,7 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml index 03d1261c0d..6324dc7dbe 100644 --- a/contracts/examples/token-release/wasm/Cargo.toml +++ b/contracts/examples/token-release/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml index 1217ce3c8c..9b03c48a6a 100644 --- a/contracts/feature-tests/abi-tester/Cargo.toml +++ b/contracts/feature-tests/abi-tester/Cargo.toml @@ -9,14 +9,14 @@ publish = false path = "src/abi_tester.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dev-dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/meta" diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json index 2a9de1527d..13858c05dc 100644 --- a/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json +++ b/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.46.1" + "version": "0.47.0" } }, "docs": [ diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json index 30d8e7f58d..bfe9673731 100644 --- a/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json +++ b/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.46.1" + "version": "0.47.0" } }, "docs": [ diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml index d52f68889c..d7826c732b 100644 --- a/contracts/feature-tests/abi-tester/meta/Cargo.toml +++ b/contracts/feature-tests/abi-tester/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml index 9766d69d28..38c2d45a31 100644 --- a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml +++ b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.toml b/contracts/feature-tests/abi-tester/wasm/Cargo.toml index 76d9c1a01d..1aef8509ab 100644 --- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml +++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml index 50c8c2ad87..7a85a4e70e 100644 --- a/contracts/feature-tests/alloc-features/Cargo.toml +++ b/contracts/feature-tests/alloc-features/Cargo.toml @@ -9,12 +9,12 @@ publish = false path = "src/alloc_features_main.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/alloc-features/meta/Cargo.toml b/contracts/feature-tests/alloc-features/meta/Cargo.toml index 1dfe74407a..31c1d44164 100644 --- a/contracts/feature-tests/alloc-features/meta/Cargo.toml +++ b/contracts/feature-tests/alloc-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml index f125091fd8..cbcf443d1f 100644 --- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml +++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml index c01fa98822..acd3294d61 100644 --- a/contracts/feature-tests/basic-features/Cargo.toml +++ b/contracts/feature-tests/basic-features/Cargo.toml @@ -9,15 +9,15 @@ publish = false path = "src/basic_features_main.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/basic-features/interact/Cargo.toml b/contracts/feature-tests/basic-features/interact/Cargo.toml index 9b34b416c6..1a027e115b 100644 --- a/contracts/feature-tests/basic-features/interact/Cargo.toml +++ b/contracts/feature-tests/basic-features/interact/Cargo.toml @@ -18,5 +18,5 @@ toml = "0.8.6" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/snippets" diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml index 1675897713..9a6a664080 100644 --- a/contracts/feature-tests/basic-features/meta/Cargo.toml +++ b/contracts/feature-tests/basic-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml index fca80f6aa9..9e499ef665 100644 --- a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml +++ b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.toml b/contracts/feature-tests/basic-features/wasm/Cargo.toml index 133da213b9..c905436b3a 100644 --- a/contracts/feature-tests/basic-features/wasm/Cargo.toml +++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = true path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/big-float-features/Cargo.toml b/contracts/feature-tests/big-float-features/Cargo.toml index 49dc8e6729..2784f4c7cd 100644 --- a/contracts/feature-tests/big-float-features/Cargo.toml +++ b/contracts/feature-tests/big-float-features/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/big_float_main.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/big-float-features/meta/Cargo.toml b/contracts/feature-tests/big-float-features/meta/Cargo.toml index 34f5528c00..d8b5c8270d 100644 --- a/contracts/feature-tests/big-float-features/meta/Cargo.toml +++ b/contracts/feature-tests/big-float-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.toml b/contracts/feature-tests/big-float-features/wasm/Cargo.toml index f1f6216573..5db771f704 100644 --- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml +++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml index 74472682d0..8a59f78c52 100644 --- a/contracts/feature-tests/composability/Cargo.toml +++ b/contracts/feature-tests/composability/Cargo.toml @@ -33,9 +33,9 @@ path = "recursive-caller" path = "vault" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/composability/builtin-func-features/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/Cargo.toml index 485248d298..75cf1475bb 100644 --- a/contracts/feature-tests/composability/builtin-func-features/Cargo.toml +++ b/contracts/feature-tests/composability/builtin-func-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/builtin_func_features.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml index a025ae72da..9f20f38309 100644 --- a/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml +++ b/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml index 6adddc3b8c..7377e0af32 100644 --- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml index e45f14a213..ceec5be22b 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml @@ -12,9 +12,9 @@ path = "first-contract" path = "second-contract" [dev-dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml index 9fd0596897..5dd2f23340 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml @@ -10,10 +10,10 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml index cbb62f3515..33070bdec3 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml index dc0a6a2ce1..a99b67ded0 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml index 1399239192..0bdfe25eef 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml @@ -10,10 +10,10 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml index d4a374b79c..e895aa03f7 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml index 677b2667e4..dffcdf11c0 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml index 8ca892d28e..213e692fbb 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml @@ -16,9 +16,9 @@ path = "parent" path = "child" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml index c638a9c34f..3b4e868d7f 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml @@ -10,9 +10,9 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml index 3d0a5f684a..c341bbdcb5 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml index 3d5ff4c574..8c4b255a6a 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml index 6a388ab1f8..4b0223694b 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml @@ -13,10 +13,10 @@ path = "src/lib.rs" path = "../child" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml index 11e25c29bf..e91998ae65 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml index 46713895e2..a7c0825e53 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml index 516513a5e7..a4f4bbc83d 100644 --- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml @@ -12,14 +12,14 @@ path = "src/forwarder_queue.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" optional = true [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml index 354bfc2f96..792c88faa5 100644 --- a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml index d96030219c..b46eae3c68 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml index f68bbba63a..e25c4b2460 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-raw/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/Cargo.toml index b91d621066..cb20939361 100644 --- a/contracts/feature-tests/composability/forwarder-raw/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/forwarder_raw.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml index f7b76873e5..fde53aec53 100644 --- a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml index c3f72c4aa4..d338ba532e 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml index 152d8161a9..9153ea36b4 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml index 6d76b5c4ae..ff7ec99f09 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml index 456ebd4920..abbfbd6d26 100644 --- a/contracts/feature-tests/composability/forwarder/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder/Cargo.toml @@ -12,10 +12,10 @@ path = "src/forwarder_main.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml index 557790209e..44339a2997 100644 --- a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml index 0f9355e90c..1b6e7e7119 100644 --- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml index dc84fddef2..370b6cc1b4 100644 --- a/contracts/feature-tests/composability/interact/Cargo.toml +++ b/contracts/feature-tests/composability/interact/Cargo.toml @@ -24,9 +24,9 @@ path = "../forwarder-queue" path = "../promises-features" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../../contracts/modules" [dependencies.multiversx-sc-snippets] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/snippets" diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml b/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml index 6cb0139bde..9a6a9f7473 100644 --- a/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml +++ b/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml @@ -10,9 +10,9 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml b/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml index e6831ee1ca..7f52fb6358 100644 --- a/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml +++ b/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml index 3fb303cfc4..9aae033317 100644 --- a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/promises-features/Cargo.toml b/contracts/feature-tests/composability/promises-features/Cargo.toml index 5043d3c56b..867abd1750 100644 --- a/contracts/feature-tests/composability/promises-features/Cargo.toml +++ b/contracts/feature-tests/composability/promises-features/Cargo.toml @@ -12,6 +12,6 @@ path = "src/promises_main.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" diff --git a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml index 89aa0110e2..343794a00a 100644 --- a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml +++ b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml index 827ddd5e0e..fc7e593733 100644 --- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/proxy-test-first/Cargo.toml b/contracts/feature-tests/composability/proxy-test-first/Cargo.toml index eaece5d3c2..7b8fd76918 100644 --- a/contracts/feature-tests/composability/proxy-test-first/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-first/Cargo.toml @@ -12,10 +12,10 @@ path = "src/proxy-test-first.rs" hex-literal = "0.4.1" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml b/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml index 4ffbc98f16..274394d687 100644 --- a/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml index 276861d5b9..a9a7ad84ce 100644 --- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/proxy-test-second/Cargo.toml b/contracts/feature-tests/composability/proxy-test-second/Cargo.toml index 0e92effc1e..bf61f04022 100644 --- a/contracts/feature-tests/composability/proxy-test-second/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-second/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/proxy-test-second.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml b/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml index 343c49181e..66676912d3 100644 --- a/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml index 0c15dac478..56e14c7410 100644 --- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/recursive-caller/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/Cargo.toml index 5cce43a5f4..2ea32650d2 100644 --- a/contracts/feature-tests/composability/recursive-caller/Cargo.toml +++ b/contracts/feature-tests/composability/recursive-caller/Cargo.toml @@ -12,9 +12,9 @@ path = "src/recursive_caller.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml index 7bdd7583b3..bc9e42dc28 100644 --- a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml +++ b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml index b16c60a97a..a4be5189c8 100644 --- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/transfer-role-features/Cargo.toml b/contracts/feature-tests/composability/transfer-role-features/Cargo.toml index 5cba837377..2b404aa0a5 100644 --- a/contracts/feature-tests/composability/transfer-role-features/Cargo.toml +++ b/contracts/feature-tests/composability/transfer-role-features/Cargo.toml @@ -12,13 +12,13 @@ path = "src/lib.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml b/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml index 46ef668c4e..b8a94db281 100644 --- a/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml +++ b/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml index 3d1aee2774..d57e641cc7 100644 --- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml index ad923b72d3..da188ccd47 100644 --- a/contracts/feature-tests/composability/vault/Cargo.toml +++ b/contracts/feature-tests/composability/vault/Cargo.toml @@ -10,9 +10,9 @@ path = "src/vault.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml index 2e329b816e..e8f48fd86d 100644 --- a/contracts/feature-tests/composability/vault/meta/Cargo.toml +++ b/contracts/feature-tests/composability/vault/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml index dcfcd7545b..08ac314271 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml +++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml index bef8e687e1..bd976326aa 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml +++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.toml b/contracts/feature-tests/composability/vault/wasm/Cargo.toml index 2e4b6ee644..47b845080d 100644 --- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml index 49b40adc7f..19071e3967 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml @@ -12,10 +12,10 @@ path = "src/crowdfunding_erc20.rs" path = "../erc20" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml index 24d3a8f5c7..0aaf458003 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml index 73de96fbcb..9a9c00e504 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml index b5bd2db425..692371b35e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml @@ -13,10 +13,10 @@ path = "src/lib.rs" path = "../erc1155" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml index f5b81a3c6a..dcae9300f7 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml index 5a759c87ac..af7b0cd311 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml index 9bb37dbbd8..d5f4663246 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml index 88d23e7d2f..790f179367 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml index 75e84418e9..1319bd0c22 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml index b77348cd15..ff93dc2fb1 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml @@ -9,12 +9,12 @@ publish = false path = "src/erc1155.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" [dev-dependencies.erc1155-user-mock] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml index 1bc26453c2..ba798a8305 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml index 4c3d62ca4f..76418e2323 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml index 6d65368cd1..e046ef567e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/erc20.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml index 53c92eae17..a482dafccc 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml index 3561b76504..586f58294e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml index 46c9989289..de29cf7588 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml @@ -10,9 +10,9 @@ path = "src/erc721.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml index ea33576f66..7f86fdae8f 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml index c883148c4e..0212e69314 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml b/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml index 5ee180b734..f92705702a 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml @@ -12,10 +12,10 @@ path = "src/lottery.rs" path = "../erc20" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml index 55204d48ab..b54fa568e3 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml index 58a74b12d6..726b8a0a46 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml b/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml index 0043d34cf4..5c5a2af3f3 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml +++ b/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/esdt_system_sc_mock.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml b/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml index 39808fb3c9..fc23828baf 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml +++ b/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml index cf2ee68945..b91e28c3d7 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml +++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/formatted-message-features/Cargo.toml b/contracts/feature-tests/formatted-message-features/Cargo.toml index 1fb7dbca00..d4c1ab53ef 100644 --- a/contracts/feature-tests/formatted-message-features/Cargo.toml +++ b/contracts/feature-tests/formatted-message-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/formatted_message_features.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml index a02b4344a6..c97fe77652 100644 --- a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml +++ b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = [ "you",] path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml index bceba46295..6edb9540d5 100644 --- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml +++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/managed-map-features/Cargo.toml b/contracts/feature-tests/managed-map-features/Cargo.toml index fd78964f33..726f990e6f 100644 --- a/contracts/feature-tests/managed-map-features/Cargo.toml +++ b/contracts/feature-tests/managed-map-features/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/mmap_features.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/managed-map-features/meta/Cargo.toml b/contracts/feature-tests/managed-map-features/meta/Cargo.toml index 2b4fe87241..896a5e8c79 100644 --- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml +++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml index 6f425763a9..50bf2be373 100644 --- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml +++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/Cargo.toml b/contracts/feature-tests/multi-contract-features/Cargo.toml index 5a4fc048d3..6e3afb7fd1 100644 --- a/contracts/feature-tests/multi-contract-features/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/Cargo.toml @@ -12,9 +12,9 @@ path = "src/multi_contract_features.rs" example_feature = [] [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml index 4a6322bf67..9b6aca7705 100644 --- a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml index bda2fd6065..be306652ce 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml index c5fc7ebc98..33209da20f 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml @@ -26,7 +26,7 @@ path = ".." features = ["example_feature"] [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml index 1bfb9d2e98..c4452626b0 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml index 2b96113f8e..7c4c2be135 100644 --- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/panic-message-features/Cargo.toml b/contracts/feature-tests/panic-message-features/Cargo.toml index 8cd27efa9e..0c62dd3f30 100644 --- a/contracts/feature-tests/panic-message-features/Cargo.toml +++ b/contracts/feature-tests/panic-message-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/panic_features.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/panic-message-features/meta/Cargo.toml b/contracts/feature-tests/panic-message-features/meta/Cargo.toml index 412052f0ef..bcac9ba497 100644 --- a/contracts/feature-tests/panic-message-features/meta/Cargo.toml +++ b/contracts/feature-tests/panic-message-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml index cc76e9c5c8..3188cd5773 100644 --- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml +++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml index 79ee585ba9..08baa8f279 100644 --- a/contracts/feature-tests/payable-features/Cargo.toml +++ b/contracts/feature-tests/payable-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/payable_features.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml index 187650e97a..83ba669e27 100644 --- a/contracts/feature-tests/payable-features/meta/Cargo.toml +++ b/contracts/feature-tests/payable-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml index 0aa622b098..f213a728ed 100644 --- a/contracts/feature-tests/payable-features/wasm/Cargo.toml +++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml index a2a0072182..3a7dbc81f1 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml index 0103880792..ea65c31713 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml @@ -13,7 +13,7 @@ path = "src/interactor_main.rs" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/snippets" # [workspace] diff --git a/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml index e648a91630..c466b7552e 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs b/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs index 5c2b4c93ee..03418afdeb 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs +++ b/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs @@ -13,7 +13,7 @@ multiversx_sc::derive_imports!(); // Additionally, we also have to update the interact-rs snippets manually to add relative paths: // [dependencies.multiversx-sc-snippets] -// version = "0.46.1" +// version = "0.47.0" // path = "../../../../framework/snippets" #[derive( diff --git a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml index 5dda345223..679ade64ef 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml b/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml index 4875f04281..9f5747d26f 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml +++ b/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" publish = false [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" features = [ "alloc" ] @@ -17,7 +17,7 @@ path = "../../examples/adder" path = "../../feature-tests/basic-features" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dev-dependencies] diff --git a/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml b/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml index a6a3d4d578..f9ed31af22 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml +++ b/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml index 18a72e91bc..25a42d6ea0 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml +++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml index 27a7cfe93f..12c06726db 100644 --- a/contracts/feature-tests/use-module/Cargo.toml +++ b/contracts/feature-tests/use-module/Cargo.toml @@ -9,17 +9,17 @@ publish = false path = "src/use_module.rs" [dependencies.multiversx-sc-modules] -version = "0.46.1" +version = "0.47.0" path = "../../../contracts/modules" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dev-dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/meta" diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml index 6e4b463d33..f760081819 100644 --- a/contracts/feature-tests/use-module/meta/Cargo.toml +++ b/contracts/feature-tests/use-module/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/use-module/meta/abi/Cargo.toml b/contracts/feature-tests/use-module/meta/abi/Cargo.toml index de07a67e9d..89fe03aab1 100644 --- a/contracts/feature-tests/use-module/meta/abi/Cargo.toml +++ b/contracts/feature-tests/use-module/meta/abi/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/use-module/use_module_expected_main.abi.json b/contracts/feature-tests/use-module/use_module_expected_main.abi.json index edd5662ec7..fe4219cff6 100644 --- a/contracts/feature-tests/use-module/use_module_expected_main.abi.json +++ b/contracts/feature-tests/use-module/use_module_expected_main.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.46.1" + "version": "0.47.0" } }, "docs": [ diff --git a/contracts/feature-tests/use-module/use_module_expected_view.abi.json b/contracts/feature-tests/use-module/use_module_expected_view.abi.json index 96de21a497..c8fed72a7d 100644 --- a/contracts/feature-tests/use-module/use_module_expected_view.abi.json +++ b/contracts/feature-tests/use-module/use_module_expected_view.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.46.1" + "version": "0.47.0" } }, "docs": [ diff --git a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml index 6bd043c988..5d7c234288 100644 --- a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml +++ b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/use-module/wasm/Cargo.toml b/contracts/feature-tests/use-module/wasm/Cargo.toml index 1a40c8133a..c749779a71 100644 --- a/contracts/feature-tests/use-module/wasm/Cargo.toml +++ b/contracts/feature-tests/use-module/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.46.1" +version = "0.47.0" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml index e7e33ea731..d1561fb3b2 100644 --- a/contracts/modules/Cargo.toml +++ b/contracts/modules/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" edition = "2021" authors = ["MultiversX "] @@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"] alloc = ["multiversx-sc/alloc"] [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../framework/base" diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml index 1f2b6810ce..77add3bfe8 100644 --- a/data/codec-derive/Cargo.toml +++ b/data/codec-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" edition = "2021" authors = ["dorin.iancu ", "Andrei Marinica ", "MultiversX "] diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml index 493a56e228..7d44573d9f 100644 --- a/data/codec/Cargo.toml +++ b/data/codec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" edition = "2021" authors = ["Andrei Marinica ", "MultiversX "] @@ -19,7 +19,7 @@ alloc = [] [dependencies.multiversx-sc-codec-derive] path = "../codec-derive" -version = "=0.18.3" +version = "=0.18.4" optional = true [dependencies] @@ -28,4 +28,4 @@ num-bigint = { version = "=0.4.4", optional = true } # can only be used in std c [dev-dependencies.multiversx-sc-codec-derive] path = "../codec-derive" -version = "=0.18.3" +version = "=0.18.4" diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml index a19c500af1..5e92e47c19 100644 --- a/framework/base/Cargo.toml +++ b/framework/base/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" edition = "2021" authors = ["Andrei Marinica ", "MultiversX "] @@ -27,10 +27,10 @@ bitflags = "=2.4.1" num-traits = { version = "=0.2.17", default-features = false } [dependencies.multiversx-sc-derive] -version = "=0.46.1" +version = "=0.47.0" path = "../derive" [dependencies.multiversx-sc-codec] -version = "=0.18.3" +version = "=0.18.4" path = "../../data/codec" features = ["derive"] diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml index 3b489d2a4e..5cfff442ee 100644 --- a/framework/derive/Cargo.toml +++ b/framework/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" edition = "2021" authors = ["Andrei Marinica ", "MultiversX "] diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml index dc6a45cfbd..89d14dfa6b 100644 --- a/framework/meta/Cargo.toml +++ b/framework/meta/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-meta" -version = "0.46.1" +version = "0.47.0" edition = "2021" authors = [ @@ -52,7 +52,7 @@ pathdiff = { version = "0.2.1", optional = true } common-path = { version = "1.0.0", optional = true } [dependencies.multiversx-sc] -version = "=0.46.1" +version = "=0.47.0" path = "../base" features = ["alloc", "num-bigint"] diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_crate_gen.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_crate_gen.rs index 04c549bc3e..50bc79fd6b 100644 --- a/framework/meta/src/cmd/contract/generate_snippets/snippet_crate_gen.rs +++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_crate_gen.rs @@ -69,7 +69,7 @@ path = "src/{SNIPPETS_SOURCE_FILE_NAME}" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.46.1" +version = "0.47.0" # [workspace] diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs index 60c02533ac..a3d18a175c 100644 --- a/framework/meta/src/cmd/contract/meta_config.rs +++ b/framework/meta/src/cmd/contract/meta_config.rs @@ -205,7 +205,7 @@ overflow-checks = false path = \"..\" [dependencies.multiversx-sc-wasm-adapter] -version = \"0.46.1\" +version = \"0.47.0\" path = \"../../../../framework/wasm-adapter\" [workspace] @@ -218,7 +218,7 @@ members = [\".\"] name: "test".to_string(), edition: "2021".to_string(), profile: ContractVariantProfile::default(), - framework_version: "0.46.1".to_string(), + framework_version: "0.47.0".to_string(), framework_path: Option::Some("../../../framework/base".to_string()), contract_features: Vec::::new(), }; diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index 8e2fc6d5be..1304d1af9f 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -3,7 +3,7 @@ use crate::{framework_version, framework_versions, version::FrameworkVersion}; /// The last version to be used for upgrades and templates. /// /// Should be edited every time a new version of the framework is released. -pub const LAST_VERSION: FrameworkVersion = framework_version!(0.46.1); +pub const LAST_VERSION: FrameworkVersion = framework_version!(0.47.0); /// Indicates where to stop with the upgrades. pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION; @@ -57,6 +57,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![ 0.45.2, 0.46.0, 0.46.1, + 0.47.0, ]; #[rustfmt::skip] @@ -77,7 +78,8 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![ 0.43.0, 0.44.0, 0.45.2, - 0.46.0 + 0.46.0, + 0.47.0, ]; pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0); diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml index 58d10c8e60..d0d2394d6e 100644 --- a/framework/scenario/Cargo.toml +++ b/framework/scenario/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-scenario" -version = "0.46.1" +version = "0.47.0" edition = "2021" authors = [ @@ -40,23 +40,23 @@ path = "src/main.rs" run-go-tests = [] [dependencies.multiversx-sc] -version = "=0.46.1" +version = "=0.47.0" features = ["alloc", "num-bigint"] path = "../base" [dependencies.multiversx-sc-meta] -version = "=0.46.1" +version = "=0.47.0" path = "../meta" [dependencies.multiversx-chain-scenario-format] -version = "0.21.1" +version = "0.22.0" path = "../../sdk/scenario-format" [dependencies.multiversx-chain-vm-executor] version = "0.2.0" [dependencies.multiversx-chain-vm] -version = "=0.7.1" +version = "=0.8.0" path = "../../vm" [dependencies.multiversx-sdk] diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml index d4ae1f888e..c51967e720 100644 --- a/framework/snippets/Cargo.toml +++ b/framework/snippets/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-snippets" -version = "0.46.1" +version = "0.47.0" edition = "2021" authors = ["MultiversX "] @@ -22,7 +22,7 @@ env_logger = "0.10" futures = "0.3" [dependencies.multiversx-sc-scenario] -version = "=0.46.1" +version = "=0.47.0" path = "../scenario" [dependencies.multiversx-sdk] diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml index 3fd08172df..e68a7482e2 100644 --- a/framework/wasm-adapter/Cargo.toml +++ b/framework/wasm-adapter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" edition = "2021" authors = [ @@ -22,5 +22,5 @@ categories = [ ] [dependencies.multiversx-sc] -version = "=0.46.1" +version = "=0.47.0" path = "../base" diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml index ffa5140a1a..6a8ae6d8aa 100644 --- a/sdk/scenario-format/Cargo.toml +++ b/sdk/scenario-format/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-chain-scenario-format" -version = "0.21.1" +version = "0.22.0" edition = "2021" authors = ["Andrei Marinica ", "MultiversX "] diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml index ee8d88e681..56625509e5 100644 --- a/tools/mxpy-snippet-generator/Cargo.toml +++ b/tools/mxpy-snippet-generator/Cargo.toml @@ -10,7 +10,7 @@ name = "mxpy-snippet-generator" path = "src/mxpy_snippet_generator.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../framework/base" [dependencies] diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml index b628bad206..4b43764c5d 100644 --- a/tools/rust-debugger/format-tests/Cargo.toml +++ b/tools/rust-debugger/format-tests/Cargo.toml @@ -9,15 +9,15 @@ name = "format-tests" path = "src/format_tests.rs" [dependencies.multiversx-sc] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/base" [dependencies.multiversx-sc-scenario] -version = "0.46.1" +version = "0.47.0" path = "../../../framework/scenario" [dependencies.multiversx-chain-vm] -version = "0.7.1" +version = "0.8.0" path = "../../../vm" [dev-dependencies] diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 1850dce047..afc0da0086 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-chain-vm" -version = "0.7.1" +version = "0.8.0" edition = "2021" authors = [ From 65a0bdf857233e7b9c97e87a627c618b0a58d48e Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Tue, 23 Jan 2024 14:13:17 +0200 Subject: [PATCH 64/84] dependency upgrade --- Cargo.lock | 4 ++-- data/codec-derive/Cargo.toml | 2 +- framework/derive/Cargo.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 08de40abae..8a5fe741b5 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -2360,9 +2360,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.75" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml index 77add3bfe8..84ee9238ab 100644 --- a/data/codec-derive/Cargo.toml +++ b/data/codec-derive/Cargo.toml @@ -21,7 +21,7 @@ proc-macro = true default = ["syn/full", "syn/parsing", "syn/extra-traits"] [dependencies] -proc-macro2 = "=1.0.75" +proc-macro2 = "=1.0.76" quote = "=1.0.35" syn = "=2.0.48" hex = "=0.4.3" diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml index 5cfff442ee..a59eea7aae 100644 --- a/framework/derive/Cargo.toml +++ b/framework/derive/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["multiversx", "blockchain", "contract"] categories = ["cryptography::cryptocurrencies", "development-tools::procedural-macro-helpers"] [dependencies] -proc-macro2 = "=1.0.75" +proc-macro2 = "=1.0.76" quote = "=1.0.35" syn = "=2.0.48" hex = "=0.4.3" From 9fab4ca5b0fcabed72406d8b4865c89556250d8e Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Tue, 23 Jan 2024 14:18:46 +0200 Subject: [PATCH 65/84] Cargo.lock update --- .../benchmarks/large-storage/wasm/Cargo.lock | 14 +++---- .../linked-list-repeat/wasm/Cargo.lock | 14 +++---- .../mappers/map-repeat/wasm/Cargo.lock | 14 +++---- .../mappers/queue-repeat/wasm/Cargo.lock | 14 +++---- .../mappers/set-repeat/wasm/Cargo.lock | 14 +++---- .../single-value-repeat/wasm/Cargo.lock | 14 +++---- .../mappers/vec-repeat/wasm/Cargo.lock | 14 +++---- .../benchmarks/send-tx-repeat/wasm/Cargo.lock | 14 +++---- .../benchmarks/str-repeat/wasm/Cargo.lock | 14 +++---- .../core/price-aggregator/wasm/Cargo.lock | 42 +++++++++---------- contracts/examples/adder/wasm/Cargo.lock | 14 +++---- .../bonding-curve-contract/wasm/Cargo.lock | 16 +++---- .../examples/check-pause/wasm/Cargo.lock | 16 +++---- .../crowdfunding-esdt/wasm/Cargo.lock | 14 +++---- .../examples/crypto-bubbles/wasm/Cargo.lock | 14 +++---- .../kitty-auction/wasm/Cargo.lock | 14 +++---- .../kitty-genetic-alg/wasm/Cargo.lock | 14 +++---- .../kitty-ownership/wasm/Cargo.lock | 14 +++---- .../examples/crypto-zombies/wasm/Cargo.lock | 14 +++---- .../examples/digital-cash/wasm/Cargo.lock | 14 +++---- contracts/examples/empty/wasm/Cargo.lock | 14 +++---- .../esdt-transfer-with-fee/wasm/Cargo.lock | 14 +++---- contracts/examples/factorial/wasm/Cargo.lock | 14 +++---- .../examples/fractional-nfts/wasm/Cargo.lock | 16 +++---- .../examples/lottery-esdt/wasm/Cargo.lock | 14 +++---- .../multisig/wasm-multisig-full/Cargo.lock | 16 +++---- .../multisig/wasm-multisig-view/Cargo.lock | 16 +++---- contracts/examples/multisig/wasm/Cargo.lock | 16 +++---- contracts/examples/nft-minter/wasm/Cargo.lock | 14 +++---- .../nft-storage-prepay/wasm/Cargo.lock | 14 +++---- .../examples/nft-subscription/wasm/Cargo.lock | 16 +++---- .../order-book/factory/wasm/Cargo.lock | 14 +++---- .../examples/order-book/pair/wasm/Cargo.lock | 14 +++---- .../examples/ping-pong-egld/wasm/Cargo.lock | 14 +++---- .../examples/proxy-pause/wasm/Cargo.lock | 14 +++---- .../rewards-distribution/wasm/Cargo.lock | 16 +++---- .../examples/seed-nft-minter/wasm/Cargo.lock | 16 +++---- .../examples/token-release/wasm/Cargo.lock | 14 +++---- .../abi-tester/wasm-abi-tester-ev/Cargo.lock | 14 +++---- .../feature-tests/abi-tester/wasm/Cargo.lock | 14 +++---- .../alloc-features/wasm/Cargo.lock | 14 +++---- .../Cargo.lock | 16 +++---- .../basic-features/wasm/Cargo.lock | 16 +++---- .../big-float-features/wasm/Cargo.lock | 14 +++---- .../builtin-func-features/wasm/Cargo.lock | 14 +++---- .../first-contract/wasm/Cargo.lock | 14 +++---- .../second-contract/wasm/Cargo.lock | 14 +++---- .../child/wasm/Cargo.lock | 14 +++---- .../parent/wasm/Cargo.lock | 14 +++---- .../wasm-forwarder-queue-promises/Cargo.lock | 14 +++---- .../forwarder-queue/wasm/Cargo.lock | 14 +++---- .../Cargo.lock | 14 +++---- .../Cargo.lock | 14 +++---- .../forwarder-raw/wasm/Cargo.lock | 14 +++---- .../composability/forwarder/wasm/Cargo.lock | 14 +++---- .../local-esdt-and-nft/wasm/Cargo.lock | 14 +++---- .../promises-features/wasm/Cargo.lock | 14 +++---- .../proxy-test-first/wasm/Cargo.lock | 14 +++---- .../proxy-test-second/wasm/Cargo.lock | 14 +++---- .../recursive-caller/wasm/Cargo.lock | 14 +++---- .../transfer-role-features/wasm/Cargo.lock | 16 +++---- .../vault/wasm-vault-promises/Cargo.lock | 14 +++---- .../vault/wasm-vault-upgrade/Cargo.lock | 14 +++---- .../composability/vault/wasm/Cargo.lock | 14 +++---- .../crowdfunding-erc20/wasm/Cargo.lock | 14 +++---- .../erc1155-marketplace/wasm/Cargo.lock | 14 +++---- .../erc1155-user-mock/wasm/Cargo.lock | 14 +++---- .../erc1155/wasm/Cargo.lock | 14 +++---- .../erc-style-contracts/erc20/wasm/Cargo.lock | 14 +++---- .../erc721/wasm/Cargo.lock | 14 +++---- .../lottery-erc20/wasm/Cargo.lock | 14 +++---- .../esdt-system-sc-mock/wasm/Cargo.lock | 14 +++---- .../wasm/Cargo.lock | 14 +++---- .../managed-map-features/wasm/Cargo.lock | 14 +++---- .../wasm-multi-contract-alt-impl/Cargo.lock | 14 +++---- .../Cargo.lock | 14 +++---- .../Cargo.lock | 14 +++---- .../multi-contract-features/wasm/Cargo.lock | 14 +++---- .../panic-message-features/wasm/Cargo.lock | 14 +++---- .../payable-features/wasm/Cargo.lock | 14 +++---- .../wasm/Cargo.lock | 14 +++---- .../wasm/Cargo.lock | 14 +++---- .../wasm-use-module-view/Cargo.lock | 16 +++---- .../feature-tests/use-module/wasm/Cargo.lock | 16 +++---- 84 files changed, 616 insertions(+), 616 deletions(-) diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock index f7578c17eb..1f9ded1339 100755 --- a/contracts/benchmarks/large-storage/wasm/Cargo.lock +++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock index 865feb06b2..f272991390 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock index a305fb4d84..57ea164e4f 100644 --- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock index 0b6767056b..7df7e7b4a2 100644 --- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock @@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock index b46b5963ae..4e10e62820 100644 --- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock @@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock index f30ce455cc..ccf01e08c7 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock @@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock index f444221a6d..22154251aa 100644 --- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock @@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock index 6f4aad21af..a62bf46fc5 100755 --- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock index 85971db909..49804be19f 100755 --- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "str-repeat" diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock index 4c20eeb801..df66cf546f 100644 --- a/contracts/core/price-aggregator/wasm/Cargo.lock +++ b/contracts/core/price-aggregator/wasm/Cargo.lock @@ -65,9 +65,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -86,7 +86,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "multiversx-price-aggregator-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "arrayvec", "getrandom", @@ -105,7 +105,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -116,7 +116,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -124,7 +124,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -134,7 +134,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -145,14 +145,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -247,9 +247,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" @@ -276,9 +276,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -286,9 +286,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", @@ -301,9 +301,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -311,9 +311,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", @@ -324,6 +324,6 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock index d5ccf9fe95..f8e6b98305 100755 --- a/contracts/examples/adder/wasm/Cargo.lock +++ b/contracts/examples/adder/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock index f316b29a68..d193d994a7 100644 --- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock +++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock index b93cb593fa..18d03e6e27 100644 --- a/contracts/examples/check-pause/wasm/Cargo.lock +++ b/contracts/examples/check-pause/wasm/Cargo.lock @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock index b9da01b4cf..b9be134103 100644 --- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock +++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock index 36badd1ea7..d1cfb7c354 100755 --- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock +++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock index 7597118097..0f20799fa0 100755 --- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock +++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -113,7 +113,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -124,7 +124,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock index 7df64103d0..8ef626cbdd 100755 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock @@ -65,7 +65,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -94,7 +94,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -105,7 +105,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -165,9 +165,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock index 54cd6e89c8..169130bd78 100755 --- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock +++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -86,7 +86,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -94,7 +94,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -104,7 +104,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -115,7 +115,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -175,9 +175,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock index fdc153930c..259652ab24 100755 --- a/contracts/examples/crypto-zombies/wasm/Cargo.lock +++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock index 7000e06c0e..89de79bbfd 100644 --- a/contracts/examples/digital-cash/wasm/Cargo.lock +++ b/contracts/examples/digital-cash/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock index 22d503edb5..cfbde325a2 100755 --- a/contracts/examples/empty/wasm/Cargo.lock +++ b/contracts/examples/empty/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock index 1562988c6f..dc33b3478b 100644 --- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock +++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock index 1e6b404d24..87ee4229cd 100755 --- a/contracts/examples/factorial/wasm/Cargo.lock +++ b/contracts/examples/factorial/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock index 28932ba2e1..2ab372c110 100644 --- a/contracts/examples/fractional-nfts/wasm/Cargo.lock +++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock index 009a98f9a5..0867bf1def 100755 --- a/contracts/examples/lottery-esdt/wasm/Cargo.lock +++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock index ad9b78e465..e4575c9aa6 100644 --- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock +++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock index eae75c8b53..bffd16a1c7 100644 --- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock +++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock index 0e7f91fa9a..27bfdcf074 100755 --- a/contracts/examples/multisig/wasm/Cargo.lock +++ b/contracts/examples/multisig/wasm/Cargo.lock @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock index 67427fb777..a485fdcf54 100644 --- a/contracts/examples/nft-minter/wasm/Cargo.lock +++ b/contracts/examples/nft-minter/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock index d3ef1a1857..4ebfca3be8 100755 --- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock +++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock index 47282821fb..7a35f030dd 100644 --- a/contracts/examples/nft-subscription/wasm/Cargo.lock +++ b/contracts/examples/nft-subscription/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock index a9bd9059b8..df4090dbe2 100644 --- a/contracts/examples/order-book/factory/wasm/Cargo.lock +++ b/contracts/examples/order-book/factory/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock index d462ec308d..0c088f75ce 100644 --- a/contracts/examples/order-book/pair/wasm/Cargo.lock +++ b/contracts/examples/order-book/pair/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock index bea6aeaad2..64c10d348f 100755 --- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock +++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock index 229ad39851..691bdee69f 100644 --- a/contracts/examples/proxy-pause/wasm/Cargo.lock +++ b/contracts/examples/proxy-pause/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock index 0de4c30fe4..1f262ab120 100644 --- a/contracts/examples/rewards-distribution/wasm/Cargo.lock +++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock index 894b478a10..ed9f8bcb6e 100644 --- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock +++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock index d35c83d474..45a7fe0c7d 100644 --- a/contracts/examples/token-release/wasm/Cargo.lock +++ b/contracts/examples/token-release/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock index e9b109f695..157e1d628b 100644 --- a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock +++ b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock index e1dc4c8202..9b37097880 100755 --- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock +++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock index 4c596241a5..b1940a67b6 100644 --- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock +++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock index be10760fe0..8562d60969 100644 --- a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock +++ b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock index 8b7ca698fe..3c6d64fda6 100755 --- a/contracts/feature-tests/basic-features/wasm/Cargo.lock +++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock index 50766e3e47..ee4076313b 100644 --- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock +++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock index 3ba60b74da..22309738d6 100644 --- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock index c5b7487dfa..c301ec9a7c 100755 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock index 10e0439758..c724f115c1 100755 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock index 13707243be..b421b43024 100755 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock index f7fb9fc4a4..dccd848f0b 100755 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock @@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock index 44f527c903..4e1cf9ace6 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock index 0b1c9ad4bd..db6b64c978 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock index be1230e15d..081ea03191 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock index e445a2c209..8128ca23c5 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock index 1e93b51559..07f6274d93 100755 --- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock index eda27af4b8..abdbc93e8b 100755 --- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock index ba0cba5dcf..b5411e6713 100755 --- a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock index 269e6986bb..5d974632e6 100644 --- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock index 6144fd2d4a..1034aff686 100755 --- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock index 02e2b79acd..83b129de5c 100755 --- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock index b62cc90d95..29deafbeb5 100755 --- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock index 188013b157..594b1d2e4f 100644 --- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock index 32b6d926b2..e6b40108ee 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock +++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock index 25368cfe90..d3140e1fb4 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock +++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock index 6ad1368d39..ac21ef7242 100755 --- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock index 5c8aababa7..350e6dc296 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock @@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock index 44a611cda6..627786eade 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock @@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock index 3d48bf1334..290a059106 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock index 0e30e1ec3f..a239efa4a8 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock index 1a5ad7c5cd..6c6a111ebc 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock index 302082f4e3..dec0765b7b 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock index 24e6d7623f..4bdccf483b 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -156,9 +156,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock index d249a2fe5d..5b6e587bab 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock +++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock index 571af529d1..6f838c6a2b 100644 --- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock +++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock index f60d76c934..e709b62491 100644 --- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock +++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock index a55956cd2a..17705079a6 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock index 3b4bb140a7..23dafe9611 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock index b059708f67..0b4eba3ebe 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock index 9a50257f17..c60601abda 100755 --- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock index fcc135d4a0..9e07bdb2ec 100755 --- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock +++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock index e31c56c011..466bf65575 100755 --- a/contracts/feature-tests/payable-features/wasm/Cargo.lock +++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock index c6280034d7..37e3619db7 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock +++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock index aeb7dd06a1..f4db7e9768 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock +++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock index 05ccfe3dd3..dfdcf5ddbe 100644 --- a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock +++ b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock index 40021a38d6..b30f6011dd 100644 --- a/contracts/feature-tests/use-module/wasm/Cargo.lock +++ b/contracts/feature-tests/use-module/wasm/Cargo.lock @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.46.1" +version = "0.47.0" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.3" +version = "0.18.4" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.3" +version = "0.18.4" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.46.1" +version = "0.47.0" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.46.1" +version = "0.47.0" dependencies = [ "multiversx-sc", ] @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "syn" From b2476a5d94c3d0524b63c89cf32a3e33afd4bc2b Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Wed, 24 Jan 2024 22:17:06 +0200 Subject: [PATCH 66/84] contracts: "file:*.wasm" -> "mxsc:*.mxsc.json" --- .../scenarios/stress_submit_test.scen.json | 720 +++++++----------- ...ss_submit_with_gas_schedule_test.scen.json | 2 +- .../tests/price_aggregator_blackbox_test.rs | 2 +- .../tests/price_aggregator_stress_blackbox.rs | 2 +- .../tests/price_aggregator_whitebox_test.rs | 2 +- .../scenarios/_generated_fund.scen.json | 4 +- .../scenarios/_generated_init.scen.json | 4 +- .../_generated_query_status.scen.json | 4 +- .../scenarios/_generated_sc_err.scen.json | 4 +- .../tests/crowdfunding_esdt_blackbox_test.rs | 3 +- .../crowdfunding_esdt_scenario_rs_test.rs | 4 - .../scenarios/pay-fee-and-fund-egld.scen.json | 2 +- .../scenarios/pay-fee-and-fund-esdt.scen.json | 2 +- .../whitelist-blacklist-fee-tokens.scen.json | 2 +- .../tests/nft_minter_scenario_rs_test.rs | 2 +- .../nft-subscription/scenarios/init.scen.json | 6 +- .../nft_subscription_scenario_rs_test.rs | 2 +- .../rewards_distribution_blackbox_test.rs | 4 +- .../scenarios/small_num_overflow.scen.json | 2 +- .../storage_mapper_address_to_id.scen.json | 4 +- .../storage_mapper_get_at_address.scen.json | 8 +- .../tests/forwarder_blackbox_test.rs | 2 +- .../tests/forwarder_whitebox_test.rs | 2 +- .../builtin_func_delete_user_name.scen.json | 4 +- .../builtin_func_set_user_name.scen.json | 4 +- .../forw_raw_contract_deploy.scen.json | 10 +- .../forw_raw_contract_upgrade.scen.json | 8 +- .../forw_raw_contract_upgrade_self.scen.json | 6 +- .../forw_raw_init_sync_accept_egld.scen.json | 2 +- ...arder_call_sync_retrieve_esdt_bt.scen.json | 8 +- ...warder_call_sync_retrieve_nft_bt.scen.json | 8 +- .../forwarder_contract_upgrade.scen.json | 6 +- ...romises_call_async_retrieve_egld.scen.json | 8 +- .../tests/composability_scenario_rs_test.rs | 8 +- .../tests/promises_feature_blackbox_test.rs | 4 +- .../tests/transfer_role_blackbox_test.rs | 4 +- .../tests/transfer_role_whitebox_test.rs | 4 +- .../esdt_system_sc_mock_scenario_rs_test.rs | 2 +- .../scenarios/mmap_get.scen.json | 2 +- .../scenarios/mmap_remove.scen.json | 2 +- .../scenarios/test.scen.json | 1 + .../scenarios/test_esdt_generation.scen.json | 1 + ...sting_framework_tester_scenario_rs_test.rs | 4 - ...e_module_claim_developer_rewards.scen.json | 8 +- .../tests/gov_module_whitebox_test.rs | 2 +- .../tests/staking_module_whitebox_test.rs | 2 +- .../tests/token_merge_module_whitebox_test.rs | 2 +- .../generate_snippets/snippet_gen_main.rs | 2 +- vm-test-build-copy.sh | 17 +- 49 files changed, 353 insertions(+), 565 deletions(-) diff --git a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json index e1eec1cc6a..f14a5ef684 100644 --- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json +++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json @@ -223,7 +223,7 @@ "id": "", "tx": { "from": "address:owner", - "contractCode": "file:../output/multiversx-price-aggregator-sc.wasm", + "contractCode": "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json", "arguments": [ "0x45474c44", "0x14", @@ -281,13 +281,11 @@ "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f", "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f" ], - "gasLimit": "120,000,000", - "gasPrice": "" + "gasLimit": "120,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -299,13 +297,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -317,13 +313,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -335,13 +329,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -353,13 +345,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -371,13 +361,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -389,13 +377,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -407,13 +393,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -425,13 +409,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -443,13 +425,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -461,13 +441,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -479,13 +457,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -497,13 +473,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -515,13 +489,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -533,13 +505,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -551,13 +521,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -569,13 +537,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -587,13 +553,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -605,13 +569,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -623,13 +585,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -641,13 +601,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -659,13 +617,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -677,13 +633,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -695,13 +649,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -713,13 +665,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -731,13 +681,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -749,13 +697,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -767,13 +713,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -785,13 +729,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -803,13 +745,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -821,13 +761,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -839,13 +777,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -857,13 +793,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -875,13 +809,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -893,13 +825,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -911,13 +841,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -929,13 +857,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -947,13 +873,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -965,13 +889,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -983,13 +905,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1001,13 +921,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1019,13 +937,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1037,13 +953,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1055,13 +969,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1073,13 +985,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1091,13 +1001,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1109,13 +1017,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1127,13 +1033,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1145,13 +1049,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1163,13 +1065,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1181,13 +1081,11 @@ "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1202,13 +1100,11 @@ "0x55534443", "0x" ], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1219,13 +1115,11 @@ "to": "sc:price-aggregator", "function": "unpause", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1239,16 +1133,14 @@ "0x45474c44", "0x55534443", "0x5f", - "0x619911dbb570258c", + "0x20f828b458ed8ed1", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1262,16 +1154,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x3cf8d3d3a05bf655", + "0x2676d2b701c3b471", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1285,16 +1175,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x4d92440172e0bf71", + "0x18052e90c58519cd", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1308,16 +1196,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xd971ed41066daa08", + "0x4b139df90523ff1e", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1331,16 +1217,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x34a9348cb04afbd1", + "0x8d8ff5c57157d8b2", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1354,16 +1238,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x6c01a77d55c0861f", + "0x429916db24f4a29a", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1377,16 +1259,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xea1e93f2b82ec0f6", + "0x20c94b8b0e79ad2c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1400,16 +1280,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x2f067fee00bbd5bc", + "0x9394613d6e0c60a0", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1423,16 +1301,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x1706fe5397a21f74", + "0x09b91e4b6287762c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1446,16 +1322,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xbffd5631e9e448a8", + "0x8f523ef0c30d5660", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1469,16 +1343,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x1940496d3bc8934c", + "0x9a3b75436bbc9750", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1492,16 +1364,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xbd0af0d3aba30235", + "0xaf90f593a2eca8b0", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1515,16 +1385,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xebcf9494ec0fac0c", + "0xe49d6e0a84537efc", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1538,16 +1406,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x7aeb67c3eabe498c", + "0x9358a38ff254be4b", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1561,16 +1427,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x5c758d17b8445f7f", + "0x4224d33d8a7342fb", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1584,16 +1448,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x6978fe48b9a58974", + "0x9787f59a3d6b5a71", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1607,16 +1469,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x8692c26f665bc7ad", + "0xae871a49e18c8a4e", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1630,16 +1490,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x2d3a93b7522e72b6", + "0x426db614e3f1db01", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1653,16 +1511,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x4faa49415e935688", + "0xa7964ea7d746a2de", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1676,16 +1532,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x5cbca2cc253dbf54", + "0x23c8408e16872669", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1699,16 +1553,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xdd20d194dd695735", + "0xdcb762dbcd5970bc", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1722,16 +1574,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x32f039c1765a2ec3", + "0xf99680ec6f6c3cc0", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1745,16 +1595,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x84372c9de3d535d9", + "0xd0e83298636e0010", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1768,16 +1616,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x91b23ed59de93417", + "0x2859a982dbd969a6", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1791,16 +1637,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x4b81d1a55887f5f9", + "0x2114dddd7df53e50", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1814,16 +1658,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xd88e348ef6679e1d", + "0x4b800fe697e62e53", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1837,16 +1679,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x2557834dc8059cc7", + "0x03f2afbf9d784e9f", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1860,16 +1700,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x22d86f8317546033", + "0x56934b4f2bf5659e", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1883,16 +1721,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x5a775ddd32ca5367", + "0x7e9d18115922d624", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1906,16 +1742,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x59f049471cd2662c", + "0x21bceff1135a433b", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1929,16 +1763,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xb59fdc2aedbf845f", + "0x014ad037b6df3b54", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1952,16 +1784,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xab13e96eb802f883", + "0x897754a9bc7fe8fb", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1975,16 +1805,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xf6f152ab53ad7170", + "0x9cbab2c3f4582758", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -1998,16 +1826,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x5bae78b87d516979", + "0x3b21d0b3809f72a2", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2021,16 +1847,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xe47859cc0fdb0abe", + "0x2a750e9ce9c38392", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2044,16 +1868,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x7c36ab1fa1a348b4", + "0x441ec6f7ccef3419", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2067,16 +1889,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x7fda3ef39b74e04b", + "0x04355cff356a9270", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2090,16 +1910,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x461d81a84db50115", + "0x9f8f08c2a0fd1712", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2113,16 +1931,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xcc0ab8ccc363dd0c", + "0x0237bdd960ee91a4", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2136,16 +1952,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x11c15058c7c6c1fa", + "0xd78d767d7431f639", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2159,16 +1973,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x293b700535555d4f", + "0x0a97da94934b5384", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2182,16 +1994,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x4e8d04d2f0e53efd", + "0x83fd9fa634cd092c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2205,16 +2015,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x42be3651d7b9499e", + "0xa603bdf728ab39ca", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2228,16 +2036,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xb82a437fc87cd8a0", + "0x1e855680884a968e", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2251,16 +2057,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xb12ebd0d9ff3f396", + "0x59185a21db734c4a", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2274,16 +2078,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x85b4d01e5a20d445", + "0x0fb5b1c819ef5113", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2297,16 +2099,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x92edaca582002375", + "0x1f0d54522394ace8", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2320,16 +2120,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x351151b47fee6331", + "0x8efc62f2eff2c135", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2343,16 +2141,14 @@ "0x45474c44", "0x55534443", "0x64", - "0x9155d2992ceb6beb", + "0x1bb36c03cf1e6971", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } }, { @@ -2366,16 +2162,14 @@ "0x45474c44", "0x55534443", "0x64", - "0xdbc0895ce5855dec", + "0x2571ea17cf81f6f2", "0x" ], - "gasLimit": "50,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], - "status": "0", - "refund": "*" + "status": "0" } } ] diff --git a/contracts/core/price-aggregator/scenarios/stress_submit_with_gas_schedule_test.scen.json b/contracts/core/price-aggregator/scenarios/stress_submit_with_gas_schedule_test.scen.json index a6c97f5c6b..1b2181b41a 100644 --- a/contracts/core/price-aggregator/scenarios/stress_submit_with_gas_schedule_test.scen.json +++ b/contracts/core/price-aggregator/scenarios/stress_submit_with_gas_schedule_test.scen.json @@ -226,7 +226,7 @@ "id": "", "tx": { "from": "address:owner", - "contractCode": "file:../output/multiversx-price-aggregator-sc.wasm", + "contractCode": "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json", "arguments": [ "0x45474c44", "0x14", diff --git a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs index 2bed182903..0c478ff82a 100644 --- a/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs +++ b/contracts/core/price-aggregator/tests/price_aggregator_blackbox_test.rs @@ -19,7 +19,7 @@ const EGLD_TICKER: &[u8] = b"EGLD"; const NR_ORACLES: usize = 4; const OWNER_ADDRESS_EXPR: &str = "address:owner"; const PRICE_AGGREGATOR_ADDRESS_EXPR: &str = "sc:price-aggregator"; -const PRICE_AGGREGATOR_PATH_EXPR: &str = "file:output/multiversx-price-aggregator-sc.wasm"; +const PRICE_AGGREGATOR_PATH_EXPR: &str = "mxsc:output/multiversx-price-aggregator-sc.mxsc.json"; const SLASH_AMOUNT: u64 = 10; const SLASH_QUORUM: usize = 3; const STAKE_AMOUNT: u64 = 20; diff --git a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs index 5141338e26..1170a4d964 100644 --- a/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs +++ b/contracts/core/price-aggregator/tests/price_aggregator_stress_blackbox.rs @@ -19,7 +19,7 @@ const EGLD_TICKER: &[u8] = b"EGLD"; const NR_ORACLES: usize = 50; const OWNER_ADDRESS_EXPR: &str = "address:owner"; const PRICE_AGGREGATOR_ADDRESS_EXPR: &str = "sc:price-aggregator"; -const PRICE_AGGREGATOR_PATH_EXPR: &str = "file:../output/multiversx-price-aggregator-sc.wasm"; +const PRICE_AGGREGATOR_PATH_EXPR: &str = "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json"; const SLASH_AMOUNT: u64 = 10; const SLASH_QUORUM: usize = 3; const STAKE_AMOUNT: u64 = 20; diff --git a/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs b/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs index 7416f5a472..22a00bccbf 100644 --- a/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs +++ b/contracts/core/price-aggregator/tests/price_aggregator_whitebox_test.rs @@ -22,7 +22,7 @@ pub const USD_TICKER: &[u8] = b"USDC"; const OWNER_ADDRESS_EXPR: &str = "address:owner"; const PRICE_AGGREGATOR_ADDRESS_EXPR: &str = "sc:price-aggregator"; -const PRICE_AGGREGATOR_PATH_EXPR: &str = "file:output/multiversx-price-aggregator-sc.wasm"; +const PRICE_AGGREGATOR_PATH_EXPR: &str = "mxsc:output/multiversx-price-aggregator-sc.mxsc.json"; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json index afd4bcaea6..6485ff115f 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_fund.scen.json @@ -29,7 +29,7 @@ "accounts": { "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": { "balance": "0", - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925" } } @@ -89,7 +89,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json index 08b369285e..e8e2095c23 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_init.scen.json @@ -29,7 +29,7 @@ "accounts": { "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": { "balance": "0", - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925" } } @@ -89,7 +89,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json index c78a0a799f..26b52d5818 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_query_status.scen.json @@ -29,7 +29,7 @@ "accounts": { "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": { "balance": "0", - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925" } } @@ -89,7 +89,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json b/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json index 465bf2bdde..d68623c3d3 100644 --- a/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json +++ b/contracts/examples/crowdfunding-esdt/scenarios/_generated_sc_err.scen.json @@ -29,7 +29,7 @@ "accounts": { "0x0000000000000000d720a08b839a004c2e6386f5aecc19ec74807d1920cb6aeb": { "balance": "0", - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925" } } @@ -89,7 +89,7 @@ "str:target": "0x07d0", "str:tokenIdentifier": "0x43524f57442d313233343536" }, - "code": "file:../output/crowdfunding-esdt.wasm", + "code": "mxsc:../output/crowdfunding-esdt.mxsc.json", "owner": "0x66687aadf862bd776c8fc18b8e9f8e20089714856ee233b3902a591d0d5f2925", "developerRewards": "0" } diff --git a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs index 65d11433b2..c6387e5c43 100644 --- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs +++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_blackbox_test.rs @@ -13,12 +13,11 @@ use multiversx_sc_scenario::{ }; use num_bigint::BigUint; -const CF_PATH_EXPR: &str = "mxsc:output/crowdfunding-esdt.mxsc.json"; const CF_DEADLINE: u64 = 7 * 24 * 60 * 60; // 1 week in seconds const CF_TOKEN_ID: &[u8] = b"CROWD-123456"; const CF_TOKEN_ID_EXPR: &str = "str:CROWD-123456"; const CROWDFUNDING_ESDT_ADDRESS_EXPR: &str = "sc:crowdfunding-esdt"; -const CROWDFUNDING_ESDT_PATH_EXPR: &str = "file:output/crowdfunding-esdt.wasm"; +const CROWDFUNDING_ESDT_PATH_EXPR: &str = "mxsc:output/crowdfunding-esdt.mxsc.json"; const FIRST_USER_ADDRESS_EXPR: &str = "address:first-user"; const OWNER_ADDRESS_EXPR: &str = "address:owner"; const SECOND_USER_ADDRESS_EXPR: &str = "address:second-user"; diff --git a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_scenario_rs_test.rs b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_scenario_rs_test.rs index 22a542bf62..b26e2488e8 100644 --- a/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_scenario_rs_test.rs +++ b/contracts/examples/crowdfunding-esdt/tests/crowdfunding_esdt_scenario_rs_test.rs @@ -8,10 +8,6 @@ fn world() -> ScenarioWorld { "mxsc:output/crowdfunding-esdt.mxsc.json", crowdfunding_esdt::ContractBuilder, ); - blockchain.register_contract( - "file:output/crowdfunding-esdt.wasm", - crowdfunding_esdt::ContractBuilder, - ); blockchain } diff --git a/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-egld.scen.json b/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-egld.scen.json index 83e5d386e5..4c66d33df3 100644 --- a/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-egld.scen.json +++ b/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-egld.scen.json @@ -90,7 +90,7 @@ "str:allTimeFeeTokens|str:.index|nested:str:CASHTOKEN-778899": "2", "str:allTimeFeeTokens|str:.index|nested:str:ESDT-778899": "3" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "0", diff --git a/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-esdt.scen.json b/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-esdt.scen.json index 7bf2184f83..6786587fe8 100644 --- a/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-esdt.scen.json +++ b/contracts/examples/digital-cash/scenarios/pay-fee-and-fund-esdt.scen.json @@ -112,7 +112,7 @@ "str:allTimeFeeTokens|str:.index|nested:str:CASHTOKEN-778899": "2", "str:allTimeFeeTokens|str:.index|nested:str:ESDT-778899": "3" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "0", diff --git a/contracts/examples/digital-cash/scenarios/whitelist-blacklist-fee-tokens.scen.json b/contracts/examples/digital-cash/scenarios/whitelist-blacklist-fee-tokens.scen.json index bd9f1afd1a..f88f0e0073 100644 --- a/contracts/examples/digital-cash/scenarios/whitelist-blacklist-fee-tokens.scen.json +++ b/contracts/examples/digital-cash/scenarios/whitelist-blacklist-fee-tokens.scen.json @@ -140,7 +140,7 @@ "str:allTimeFeeTokens|str:.index|nested:str:CASHTOKEN-778899": "2", "str:allTimeFeeTokens|str:.index|nested:str:ESDT-778899": "3" }, - "code": "file:../output/digital-cash.wasm" + "code": "mxsc:../output/digital-cash.mxsc.json" }, "address:acc1": { "nonce": "0", diff --git a/contracts/examples/nft-minter/tests/nft_minter_scenario_rs_test.rs b/contracts/examples/nft-minter/tests/nft_minter_scenario_rs_test.rs index bf1c734f41..f0e564a249 100644 --- a/contracts/examples/nft-minter/tests/nft_minter_scenario_rs_test.rs +++ b/contracts/examples/nft-minter/tests/nft_minter_scenario_rs_test.rs @@ -4,7 +4,7 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/nft-minter"); - blockchain.register_contract("file:output/nft-minter.wasm", nft_minter::ContractBuilder); + blockchain.register_contract("mxsc:output/nft-minter.mxsc.json", nft_minter::ContractBuilder); blockchain } diff --git a/contracts/examples/nft-subscription/scenarios/init.scen.json b/contracts/examples/nft-subscription/scenarios/init.scen.json index 40a0f7da51..73389dc5b0 100644 --- a/contracts/examples/nft-subscription/scenarios/init.scen.json +++ b/contracts/examples/nft-subscription/scenarios/init.scen.json @@ -26,7 +26,7 @@ "id": "deploy", "tx": { "from": "address:owner", - "contractCode": "file:../output/nft-subscription.wasm", + "contractCode": "mxsc:../output/nft-subscription.mxsc.json", "arguments": [], "gasLimit": "10,000,000", "gasPrice": "0" @@ -46,7 +46,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/nft-subscription.wasm" + "code": "mxsc:../output/nft-subscription.mxsc.json" }, "+": "" } @@ -69,7 +69,7 @@ "storage": { "str:tokenId": "str:NFT-123456" }, - "code": "file:../output/nft-subscription.wasm", + "code": "mxsc:../output/nft-subscription.mxsc.json", "owner": "address:owner" } } diff --git a/contracts/examples/nft-subscription/tests/nft_subscription_scenario_rs_test.rs b/contracts/examples/nft-subscription/tests/nft_subscription_scenario_rs_test.rs index 2a5f6f682c..4340f468a7 100644 --- a/contracts/examples/nft-subscription/tests/nft_subscription_scenario_rs_test.rs +++ b/contracts/examples/nft-subscription/tests/nft_subscription_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/examples/nft-subscription"); blockchain.register_contract( - "file:output/nft-subscription.wasm", + "mxsc:output/nft-subscription.mxsc.json", nft_subscription::ContractBuilder, ); blockchain diff --git a/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs b/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs index 1305483959..2902c7832c 100644 --- a/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs +++ b/contracts/examples/rewards-distribution/tests/rewards_distribution_blackbox_test.rs @@ -31,9 +31,9 @@ const NFT_TOKEN_ID_EXPR: &str = "str:NFT-123456"; const ALICE_ADDRESS_EXPR: &str = "address:alice"; const OWNER_ADDRESS_EXPR: &str = "address:owner"; const REWARDS_DISTRIBUTION_ADDRESS_EXPR: &str = "sc:rewards-distribution"; -const REWARDS_DISTRIBUTION_PATH_EXPR: &str = "file:output/rewards-distribution.wasm"; +const REWARDS_DISTRIBUTION_PATH_EXPR: &str = "mxsc:output/rewards-distribution.mxsc.json"; const SEED_NFT_MINTER_ADDRESS_EXPR: &str = "sc:seed-nft-minter"; -const SEED_NFT_MINTER_PATH_EXPR: &str = "file:../seed-nft-minter/output/seed-nft-minter.wasm"; +const SEED_NFT_MINTER_PATH_EXPR: &str = "mxsc:../seed-nft-minter/output/seed-nft-minter.mxsc.json"; type RewardsDistributionContract = ContractInfo>; type SeedNFTMinterContract = ContractInfo>; diff --git a/contracts/feature-tests/basic-features/scenarios/small_num_overflow.scen.json b/contracts/feature-tests/basic-features/scenarios/small_num_overflow.scen.json index 992cc9f370..2fc9de2183 100644 --- a/contracts/feature-tests/basic-features/scenarios/small_num_overflow.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/small_num_overflow.scen.json @@ -9,7 +9,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_address_to_id.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_address_to_id.scen.json index 975534a92e..91493a8d0c 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_address_to_id.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_address_to_id.scen.json @@ -8,12 +8,12 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:extra-instance": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json index b3768235b6..4a1a0ea1e7 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json @@ -8,12 +8,12 @@ "sc:caller": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:to-be-called": { "nonce": "0", "balance": "0", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", @@ -72,13 +72,13 @@ "storage": { "str:contract_address": "sc:to-be-called" }, - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "sc:to-be-called": { "nonce": "0", "balance": "0", "storage": "*", - "code": "file:../output/basic-features.wasm" + "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "*", diff --git a/contracts/feature-tests/composability/forwarder/tests/forwarder_blackbox_test.rs b/contracts/feature-tests/composability/forwarder/tests/forwarder_blackbox_test.rs index d74be9fbb5..bbe8d68ecb 100644 --- a/contracts/feature-tests/composability/forwarder/tests/forwarder_blackbox_test.rs +++ b/contracts/feature-tests/composability/forwarder/tests/forwarder_blackbox_test.rs @@ -10,7 +10,7 @@ use multiversx_sc_scenario::{ const USER_ADDRESS_EXPR: &str = "address:user"; const FORWARDER_ADDRESS_EXPR: &str = "sc:forwarder"; -const FORWARDER_PATH_EXPR: &str = "file:output/forwarder.wasm"; +const FORWARDER_PATH_EXPR: &str = "mxsc:output/forwarder.mxsc.json"; const NFT_TOKEN_ID_EXPR: &str = "str:COOL-123456"; const NFT_TOKEN_ID: &[u8] = b"COOL-123456"; diff --git a/contracts/feature-tests/composability/forwarder/tests/forwarder_whitebox_test.rs b/contracts/feature-tests/composability/forwarder/tests/forwarder_whitebox_test.rs index 121cd9b991..4cb15d884f 100644 --- a/contracts/feature-tests/composability/forwarder/tests/forwarder_whitebox_test.rs +++ b/contracts/feature-tests/composability/forwarder/tests/forwarder_whitebox_test.rs @@ -10,7 +10,7 @@ use multiversx_sc_scenario::{ const USER_ADDRESS_EXPR: &str = "address:user"; const FORWARDER_ADDRESS_EXPR: &str = "sc:forwarder"; -const FORWARDER_PATH_EXPR: &str = "file:output/forwarder.wasm"; +const FORWARDER_PATH_EXPR: &str = "mxsc:output/forwarder.mxsc.json"; const NFT_TOKEN_ID_EXPR: &str = "str:COOL-123456"; const NFT_TOKEN_ID: &[u8] = b"COOL-123456"; diff --git a/contracts/feature-tests/composability/scenarios/builtin_func_delete_user_name.scen.json b/contracts/feature-tests/composability/scenarios/builtin_func_delete_user_name.scen.json index b93caef9b5..e190c58b59 100644 --- a/contracts/feature-tests/composability/scenarios/builtin_func_delete_user_name.scen.json +++ b/contracts/feature-tests/composability/scenarios/builtin_func_delete_user_name.scen.json @@ -15,7 +15,7 @@ "sc:dns#00": { "nonce": "0", "balance": "0", - "code": "file:../builtin-func-features/output/builtin-func-features.wasm" + "code": "mxsc:../builtin-func-features/output/builtin-func-features.mxsc.json" } } }, @@ -52,7 +52,7 @@ "sc:dns#00": { "nonce": "0", "balance": "0", - "code": "file:../builtin-func-features/output/builtin-func-features.wasm" + "code": "mxsc:../builtin-func-features/output/builtin-func-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/builtin_func_set_user_name.scen.json b/contracts/feature-tests/composability/scenarios/builtin_func_set_user_name.scen.json index cebd1d3f1f..ca5e99f9f9 100644 --- a/contracts/feature-tests/composability/scenarios/builtin_func_set_user_name.scen.json +++ b/contracts/feature-tests/composability/scenarios/builtin_func_set_user_name.scen.json @@ -14,7 +14,7 @@ "sc:dns#00": { "nonce": "0", "balance": "0", - "code": "file:../builtin-func-features/output/builtin-func-features.wasm" + "code": "mxsc:../builtin-func-features/output/builtin-func-features.mxsc.json" } } }, @@ -52,7 +52,7 @@ "sc:dns#00": { "nonce": "0", "balance": "0", - "code": "file:../builtin-func-features/output/builtin-func-features.wasm" + "code": "mxsc:../builtin-func-features/output/builtin-func-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json index 8f2a2d25ba..dfaf89f427 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_deploy.scen.json @@ -40,7 +40,7 @@ "to": "sc:forwarder", "function": "deploy_contract", "arguments": [ - "file:../vault/output/vault.wasm", + "mxsc:../vault/output/vault.mxsc.json", "0x0100" ], "gasLimit": "50,000,000", @@ -64,7 +64,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "codeMetadata": "0x0100", "owner": "sc:forwarder" }, @@ -79,7 +79,7 @@ "to": "sc:forwarder", "function": "deploy_contract", "arguments": [ - "file:../vault/output/vault.wasm", + "mxsc:../vault/output/vault.mxsc.json", "0x0100", "str:some_argument" ], @@ -105,7 +105,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "codeMetadata": "0x0100", "owner": "sc:forwarder" }, @@ -145,7 +145,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "codeMetadata": "0x0100", "owner": "sc:forwarder" }, diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json index e9a3688672..99400cb23c 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade.scen.json @@ -9,7 +9,7 @@ "code": "mxsc:../forwarder-raw/output/forwarder-raw.mxsc.json" }, "sc:reference": { - "code": "file:../vault/output/vault-upgrade.wasm" + "code": "mxsc:../vault/output/vault-upgrade.mxsc.json" }, "sc:child": { "code": "mxsc:../vault/output/vault.mxsc.json", @@ -41,7 +41,7 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../vault/output/vault-upgrade.wasm", + "code": "mxsc:../vault/output/vault-upgrade.mxsc.json", "codeMetadata": "0x0102" }, "+": "" @@ -56,7 +56,7 @@ "function": "call_upgrade", "arguments": [ "sc:child", - "file:../vault/output/vault.wasm", + "mxsc:../vault/output/vault.mxsc.json", "0x0102", "str:upgrade-init-arg" ], @@ -74,7 +74,7 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../vault/output/vault.wasm", + "code": "mxsc:../vault/output/vault.mxsc.json", "codeMetadata": "0x0102" }, "+": "" diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json index f78d62d44e..1b9ecffa92 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_contract_upgrade_self.scen.json @@ -10,7 +10,7 @@ "owner": "sc:forwarder" }, "sc:reference": { - "code": "file:../vault/output/vault-upgrade.wasm" + "code": "mxsc:../vault/output/vault-upgrade.mxsc.json" } } }, @@ -42,12 +42,12 @@ "nonce": "*" }, "sc:forwarder": { - "code": "file:../vault/output/vault-upgrade.wasm", + "code": "mxsc:../vault/output/vault-upgrade.mxsc.json", "codeMetadata": "0x0102", "owner": "sc:forwarder" }, "sc:reference": { - "code": "file:../vault/output/vault-upgrade.wasm" + "code": "mxsc:../vault/output/vault-upgrade.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json b/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json index 91fe04e196..c9cd3868aa 100644 --- a/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/forw_raw_init_sync_accept_egld.scen.json @@ -27,7 +27,7 @@ "tx": { "from": "address:owner", "egldValue": "1000", - "contractCode": "file:../forwarder-raw/output/forwarder-raw-init-sync-call.wasm", + "contractCode": "mxsc:../forwarder-raw/output/forwarder-raw-init-sync-call.mxsc.json", "arguments": [ "sc:vault", "str:accept_funds" diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_esdt_bt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_esdt_bt.scen.json index 071238feb1..cc09dab90a 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_esdt_bt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_esdt_bt.scen.json @@ -14,12 +14,12 @@ "esdt": { "str:TEST-TOKENA": "1000" }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -119,7 +119,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -128,7 +128,7 @@ "str:TEST-TOKENA": "1000" }, "storage": "*", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_nft_bt.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_nft_bt.scen.json index 56621a12d9..cd0501af64 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_nft_bt.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_call_sync_retrieve_nft_bt.scen.json @@ -21,12 +21,12 @@ ] } }, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -128,7 +128,7 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", @@ -144,7 +144,7 @@ } }, "storage": "*", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json b/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json index c258df9641..a5434efd3c 100644 --- a/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json +++ b/contracts/feature-tests/composability/scenarios/forwarder_contract_upgrade.scen.json @@ -9,7 +9,7 @@ "code": "mxsc:../forwarder/output/forwarder.mxsc.json" }, "sc:reference": { - "code": "file:../vault/output/vault-upgrade.wasm" + "code": "mxsc:../vault/output/vault-upgrade.mxsc.json" }, "sc:child": { "code": "mxsc:../vault/output/vault.mxsc.json", @@ -40,7 +40,7 @@ "step": "checkState", "accounts": { "sc:child": { - "code": "file:../vault/output/vault-upgrade.wasm", + "code": "mxsc:../vault/output/vault-upgrade.mxsc.json", "codeMetadata": "0x0100" }, "+": "" @@ -56,7 +56,7 @@ "function": "upgradeVault", "arguments": [ "sc:child", - "file:../vault/output/vault.wasm", + "mxsc:../vault/output/vault.mxsc.json", "str:arg" ], "gasLimit": "500,000,000", diff --git a/contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json b/contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json index 3d8fc1ac7a..bb8e199e91 100644 --- a/contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json +++ b/contracts/feature-tests/composability/scenarios/promises_call_async_retrieve_egld.scen.json @@ -10,12 +10,12 @@ "sc:vault": { "nonce": "0", "balance": "1000", - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "0", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } }, @@ -123,13 +123,13 @@ "nonce": "0", "balance": "0", "storage": {}, - "code": "file:../vault/output/vault.wasm" + "code": "mxsc:../vault/output/vault.mxsc.json" }, "sc:forwarder": { "nonce": "0", "balance": "1000", "storage": "*", - "code": "file:../promises-features/output/promises-features.wasm" + "code": "mxsc:../promises-features/output/promises-features.mxsc.json" } } } diff --git a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs index 45fd1bfe5c..fae64b1ab1 100644 --- a/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs +++ b/contracts/feature-tests/composability/tests/composability_scenario_rs_test.rs @@ -5,11 +5,11 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/feature-tests/composability"); blockchain.register_contract( - "file:builtin-func-features/output/builtin-func-features.wasm", + "mxsc:builtin-func-features/output/builtin-func-features.mxsc.json", builtin_func_features::ContractBuilder, ); blockchain.register_contract( - "file:forwarder-queue/output/forwarder-queue.wasm", + "mxsc:forwarder-queue/output/forwarder-queue.mxsc.json", forwarder_queue::ContractBuilder, ); blockchain.register_contract( @@ -40,12 +40,12 @@ fn world() -> ScenarioWorld { let vault_sc_config = meta::multi_contract_config::(&blockchain.current_dir().join("vault")); blockchain.register_contract_variant( - "file:vault/output/vault.wasm", + "mxsc:vault/output/vault.mxsc.json", vault::ContractBuilder, vault_sc_config.find_contract("vault"), ); blockchain.register_contract_variant( - "file:vault/output/vault-upgrade.wasm", + "mxsc:vault/output/vault-upgrade.mxsc.json", vault::ContractBuilder, vault_sc_config.find_contract("vault-upgrade"), ); diff --git a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs index 87b682a53f..78084581b0 100644 --- a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs +++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs @@ -9,9 +9,9 @@ use promises_features::call_sync_bt::ProxyTrait; const USER_ADDRESS_EXPR: &str = "address:user"; const PROMISES_FEATURE_ADDRESS_EXPR: &str = "sc:promises-feature"; -const PROMISES_FEATURES_PATH_EXPR: &str = "file:promises-features/output/promises-feature.wasm"; +const PROMISES_FEATURES_PATH_EXPR: &str = "mxsc:promises-features/output/promises-feature.mxsc.json"; const VAULT_ADDRESS_EXPR: &str = "sc:vault"; -const VAULT_PATH_EXPR: &str = "file:../vault/output/vault.wasm"; +const VAULT_PATH_EXPR: &str = "mxsc:../vault/output/vault.mxsc.json"; const TOKEN_ID_EXPR: &str = "str:TOKEN-123456"; const TOKEN_ID: &[u8] = b"TOKEN-123456"; diff --git a/contracts/feature-tests/composability/transfer-role-features/tests/transfer_role_blackbox_test.rs b/contracts/feature-tests/composability/transfer-role-features/tests/transfer_role_blackbox_test.rs index 89f267c287..acaefbfb1d 100644 --- a/contracts/feature-tests/composability/transfer-role-features/tests/transfer_role_blackbox_test.rs +++ b/contracts/feature-tests/composability/transfer-role-features/tests/transfer_role_blackbox_test.rs @@ -13,12 +13,12 @@ const ACCEPT_FUNDS_FUNC_NAME: &[u8] = b"accept_funds"; const OWNER_ADDRESS_EXPR: &str = "address:owner"; const REJECT_FUNDS_FUNC_NAME: &[u8] = b"reject_funds"; const TRANSFER_ROLE_FEATURES_ADDRESS_EXPR: &str = "sc:transfer-role-features"; -const TRANSFER_ROLE_FEATURES_PATH_EXPR: &str = "file:output/transfer-role-features.wasm"; +const TRANSFER_ROLE_FEATURES_PATH_EXPR: &str = "mxsc:output/transfer-role-features.mxsc.json"; const TRANSFER_TOKEN_ID: &[u8] = b"TRANSFER-123456"; const TRANSFER_TOKEN_ID_EXPR: &str = "str:TRANSFER-123456"; const USER_ADDRESS_EXPR: &str = "address:user"; const VAULT_ADDRESS_EXPR: &str = "sc:vault"; -const VAULT_PATH_EXPR: &str = "file:../vault/output/vault.wasm"; +const VAULT_PATH_EXPR: &str = "mxsc:../vault/output/vault.mxsc.json"; type TransferRoleFeaturesContract = ContractInfo>; diff --git a/contracts/feature-tests/composability/transfer-role-features/tests/transfer_role_whitebox_test.rs b/contracts/feature-tests/composability/transfer-role-features/tests/transfer_role_whitebox_test.rs index 3412e66b6b..155f82ce9d 100644 --- a/contracts/feature-tests/composability/transfer-role-features/tests/transfer_role_whitebox_test.rs +++ b/contracts/feature-tests/composability/transfer-role-features/tests/transfer_role_whitebox_test.rs @@ -15,7 +15,7 @@ const OWNER_ADDRESS_EXPR: &str = "address:owner"; const USER_ADDRESS_EXPR: &str = "address:user"; const TRANSFER_ROLE_FEATURES_ADDRESS_EXPR: &str = "sc:transfer-role-features"; -const TRANSFER_ROLE_FEATURES_PATH_EXPR: &str = "file:output/transfer-role-features.wasm"; +const TRANSFER_ROLE_FEATURES_PATH_EXPR: &str = "mxsc:output/transfer-role-features.mxsc.json"; const TRANSFER_TOKEN_ID_EXPR: &str = "str:TRANSFER-123456"; const TRANSFER_TOKEN_ID: &[u8] = b"TRANSFER-123456"; @@ -56,7 +56,7 @@ fn test_transfer_role() { let vault_code = world.code_expression(VAULT_PATH_EXPR); const VAULT_ADDRESS_EXPR: &str = "sc:vault"; - const VAULT_PATH_EXPR: &str = "file:../vault/output/vault.wasm"; + const VAULT_PATH_EXPR: &str = "mxsc:../vault/output/vault.mxsc.json"; world.register_contract(VAULT_PATH_EXPR, vault::ContractBuilder); world.set_state_step( diff --git a/contracts/feature-tests/esdt-system-sc-mock/tests/esdt_system_sc_mock_scenario_rs_test.rs b/contracts/feature-tests/esdt-system-sc-mock/tests/esdt_system_sc_mock_scenario_rs_test.rs index 2ae12b5503..c0809e7b40 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/tests/esdt_system_sc_mock_scenario_rs_test.rs +++ b/contracts/feature-tests/esdt-system-sc-mock/tests/esdt_system_sc_mock_scenario_rs_test.rs @@ -5,7 +5,7 @@ fn world() -> ScenarioWorld { blockchain.set_current_dir_from_workspace("contracts/feature-tests/esdt-system-sc-mock"); blockchain.register_contract( - "file:output/esdt-system-sc-mock.wasm", + "mxsc:output/esdt-system-sc-mock.mxsc.json", esdt_system_sc_mock::ContractBuilder, ); blockchain diff --git a/contracts/feature-tests/managed-map-features/scenarios/mmap_get.scen.json b/contracts/feature-tests/managed-map-features/scenarios/mmap_get.scen.json index 9b2dd3d204..90689c02c4 100644 --- a/contracts/feature-tests/managed-map-features/scenarios/mmap_get.scen.json +++ b/contracts/feature-tests/managed-map-features/scenarios/mmap_get.scen.json @@ -15,7 +15,7 @@ "str:key|u32:2": "", "str:value|u32:2": "str:value2" }, - "code": "file:../output/managed-map-features.wasm" + "code": "mxsc:../output/managed-map-features.mxsc.json" }, "address:an-account": { "nonce": "0" diff --git a/contracts/feature-tests/managed-map-features/scenarios/mmap_remove.scen.json b/contracts/feature-tests/managed-map-features/scenarios/mmap_remove.scen.json index badd76e606..213e51911e 100644 --- a/contracts/feature-tests/managed-map-features/scenarios/mmap_remove.scen.json +++ b/contracts/feature-tests/managed-map-features/scenarios/mmap_remove.scen.json @@ -17,7 +17,7 @@ "str:key|u32:3": "str:key3", "str:value|u32:3": "str:value3" }, - "code": "file:../output/managed-map-features.wasm" + "code": "mxsc:../output/managed-map-features.mxsc.json" }, "address:an-account": { "nonce": "0" diff --git a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json index 17477882fa..d92783c9a0 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json +++ b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test.scen.json @@ -27,6 +27,7 @@ "str:totalValue": "0x01" }, "code": "file:../output/rust-testing-framework-tester.wasm", + "codeMetadata": "0x0506", "developerRewards": "0" } } diff --git a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json index 293b6b9c74..558a14c743 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json +++ b/contracts/feature-tests/rust-testing-framework-tester/scenarios/test_esdt_generation.scen.json @@ -28,6 +28,7 @@ } }, "code": "file:../output/rust-testing-framework-tester.wasm", + "codeMetadata": "0x0506", "developerRewards": "0" } } diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs index 353a7e9b84..c50fb02fff 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs +++ b/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs @@ -9,10 +9,6 @@ fn world() -> ScenarioWorld { "mxsc:output/rust-testing-framework-tester.mxsc.json", rust_testing_framework_tester::ContractBuilder, ); - blockchain.register_contract( - "file:output/rust-testing-framework-tester.wasm", - rust_testing_framework_tester::ContractBuilder, - ); blockchain } diff --git a/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json b/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json index b8d5f8ba66..ab080331e2 100644 --- a/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json +++ b/contracts/feature-tests/use-module/scenarios/use_module_claim_developer_rewards.scen.json @@ -44,13 +44,13 @@ "accounts": { "sc:child": { "balance": "500", - "code": "file:../../composability/vault/output/vault.wasm", + "code": "mxsc:../../composability/vault/output/vault.mxsc.json", "owner": "sc:use_module", "developerRewards": "100" }, "sc:not_child": { "balance": "500", - "code": "file:../../composability/vault/output/vault.wasm", + "code": "mxsc:../../composability/vault/output/vault.mxsc.json", "owner": "sc:not_owner" } } @@ -115,13 +115,13 @@ }, "sc:child": { "balance": "500", - "code": "file:../../composability/vault/output/vault.wasm", + "code": "mxsc:../../composability/vault/output/vault.mxsc.json", "owner": "sc:use_module", "developerRewards": "0" }, "sc:not_child": { "balance": "500", - "code": "file:../../composability/vault/output/vault.wasm", + "code": "mxsc:../../composability/vault/output/vault.mxsc.json", "owner": "sc:not_owner" } } diff --git a/contracts/feature-tests/use-module/tests/gov_module_whitebox_test.rs b/contracts/feature-tests/use-module/tests/gov_module_whitebox_test.rs index 23c7eb8dec..fe90f658e4 100644 --- a/contracts/feature-tests/use-module/tests/gov_module_whitebox_test.rs +++ b/contracts/feature-tests/use-module/tests/gov_module_whitebox_test.rs @@ -23,7 +23,7 @@ const INITIAL_GOV_TOKEN_BALANCE: u64 = 1_000; const GAS_LIMIT: u64 = 1_000_000; const USE_MODULE_ADDRESS_EXPR: &str = "sc:use-module"; -const USE_MODULE_PATH_EXPR: &str = "file:output/use-module.wasm"; +const USE_MODULE_PATH_EXPR: &str = "mxsc:output/use-module.mxsc.json"; const OWNER_ADDRESS_EXPR: &str = "address:owner"; const FIRST_USER_ADDRESS_EXPR: &str = "address:first-user"; diff --git a/contracts/feature-tests/use-module/tests/staking_module_whitebox_test.rs b/contracts/feature-tests/use-module/tests/staking_module_whitebox_test.rs index 14ee01cc0f..91a96db16a 100644 --- a/contracts/feature-tests/use-module/tests/staking_module_whitebox_test.rs +++ b/contracts/feature-tests/use-module/tests/staking_module_whitebox_test.rs @@ -24,7 +24,7 @@ const PAUL_ADDRESS_EXPR: &str = "address:paul"; const SALLY_ADDRESS_EXPR: &str = "address:sally"; const USE_MODULE_ADDRESS_EXPR: &str = "sc:use-module"; -const USE_MODULE_PATH_EXPR: &str = "file:output/use-module.wasm"; +const USE_MODULE_PATH_EXPR: &str = "mxsc:output/use-module.mxsc.json"; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); diff --git a/contracts/feature-tests/use-module/tests/token_merge_module_whitebox_test.rs b/contracts/feature-tests/use-module/tests/token_merge_module_whitebox_test.rs index 7831b75732..a970685918 100644 --- a/contracts/feature-tests/use-module/tests/token_merge_module_whitebox_test.rs +++ b/contracts/feature-tests/use-module/tests/token_merge_module_whitebox_test.rs @@ -21,7 +21,7 @@ const OWNER_ADDRESS_EXPR: &str = "address:owner"; const USER_ADDRESS_EXPR: &str = "address:user"; const USE_MODULE_ADDRESS_EXPR: &str = "sc:use-module"; -const USE_MODULE_PATH_EXPR: &str = "file:output/use-module.wasm"; +const USE_MODULE_PATH_EXPR: &str = "mxsc:output/use-module.mxsc.json"; const MERGED_TOKEN_ID_EXPR: &str = "str:MERGED-123456"; const MERGED_TOKEN_ID: &[u8] = b"MERGED-123456"; diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_gen_main.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_gen_main.rs index d85c1cc48c..b158bcd0ce 100644 --- a/framework/meta/src/cmd/contract/generate_snippets/snippet_gen_main.rs +++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_gen_main.rs @@ -22,7 +22,7 @@ impl MetaConfig { let main_contract = self.sc_config.main_contract(); let crate_name = &main_contract.contract_name; let snake_case_name = &main_contract.public_name_snake_case(); - let wasm_output_file_path_expr = format!("\"file:../output/{crate_name}.wasm\""); + let wasm_output_file_path_expr = format!("\"mxsc:../output/{crate_name}.mxsc.json\""); let file = create_snippets_crate_and_get_lib_file(&self.snippets_dir, crate_name, args.overwrite); write_snippets_to_file( diff --git a/vm-test-build-copy.sh b/vm-test-build-copy.sh index d6ccae7b50..debee4c513 100755 --- a/vm-test-build-copy.sh +++ b/vm-test-build-copy.sh @@ -66,14 +66,15 @@ build_and_copy_composability() { rm contracts/feature-tests/composability/$contract/output/*.wasm } -build_and_copy ./contracts/feature-tests/composability/forwarder $VM_REPO_PATH/test/features/composability/forwarder -build_and_copy ./contracts/feature-tests/composability/forwarder-queue $VM_REPO_PATH/test/features/composability/forwarder-queue -build_and_copy ./contracts/feature-tests/composability/forwarder-raw $VM_REPO_PATH/test/features/composability/forwarder-raw -build_and_copy ./contracts/feature-tests/composability/proxy-test-first $VM_REPO_PATH/test/features/composability/proxy-test-first -build_and_copy ./contracts/feature-tests/composability/proxy-test-second $VM_REPO_PATH/test/features/composability/proxy-test-second -build_and_copy ./contracts/feature-tests/composability/recursive-caller $VM_REPO_PATH/test/features/composability/recursive-caller -build_and_copy ./contracts/feature-tests/composability/promises-features $VM_REPO_PATH/test/features/composability/promises-features -build_and_copy ./contracts/feature-tests/composability/vault $VM_REPO_PATH/test/features/composability/vault +build_and_copy ./contracts/feature-tests/composability/builtin-func-features $VM_REPO_PATH/test/features/composability/builtin-func-features +build_and_copy ./contracts/feature-tests/composability/forwarder $VM_REPO_PATH/test/features/composability/forwarder +build_and_copy ./contracts/feature-tests/composability/forwarder-queue $VM_REPO_PATH/test/features/composability/forwarder-queue +build_and_copy ./contracts/feature-tests/composability/forwarder-raw $VM_REPO_PATH/test/features/composability/forwarder-raw +build_and_copy ./contracts/feature-tests/composability/proxy-test-first $VM_REPO_PATH/test/features/composability/proxy-test-first +build_and_copy ./contracts/feature-tests/composability/proxy-test-second $VM_REPO_PATH/test/features/composability/proxy-test-second +build_and_copy ./contracts/feature-tests/composability/recursive-caller $VM_REPO_PATH/test/features/composability/recursive-caller +build_and_copy ./contracts/feature-tests/composability/promises-features $VM_REPO_PATH/test/features/composability/promises-features +build_and_copy ./contracts/feature-tests/composability/vault $VM_REPO_PATH/test/features/composability/vault rm -f $VM_REPO_PATH/test/features/composability/scenarios/* cp -R contracts/feature-tests/composability/scenarios \ From 46ef48ab972667ac16179d619d67f20be63bf433 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Wed, 24 Jan 2024 22:18:16 +0200 Subject: [PATCH 67/84] github action version fix --- .github/workflows/actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index d0fa487127..a70099b29d 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -32,7 +32,7 @@ jobs: cargo install twiggy cargo install --path framework/meta - sc-meta install mx-scenario-go --tag v0.0.101-alpha.1 + sc-meta install mx-scenario-go --tag v2.0.0 which mxpy which wasm-opt From 4351ab2b00deb66c6d329de547cabcf0683cbcf6 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Wed, 24 Jan 2024 22:29:10 +0200 Subject: [PATCH 68/84] multisig test fix --- .../multisig/test-contracts/adder.mxsc.json | 77 ++++++++++++++++++ .../multisig/test-contracts/adder.wasm | Bin 697 -> 0 bytes .../test-contracts/factorial.mxsc.json | 54 ++++++++++++ .../multisig/test-contracts/factorial.wasm | Bin 772 -> 0 bytes 4 files changed, 131 insertions(+) create mode 100644 contracts/examples/multisig/test-contracts/adder.mxsc.json delete mode 100755 contracts/examples/multisig/test-contracts/adder.wasm create mode 100644 contracts/examples/multisig/test-contracts/factorial.mxsc.json delete mode 100755 contracts/examples/multisig/test-contracts/factorial.wasm diff --git a/contracts/examples/multisig/test-contracts/adder.mxsc.json b/contracts/examples/multisig/test-contracts/adder.mxsc.json new file mode 100644 index 0000000000..15527eb132 --- /dev/null +++ b/contracts/examples/multisig/test-contracts/adder.mxsc.json @@ -0,0 +1,77 @@ +{ + "buildInfo": { + "rustc": { + "version": "1.76.0-nightly", + "commitHash": "21cce21d8c012f14cf74d5afddd795d324600dac", + "commitDate": "2023-12-11", + "channel": "Nightly", + "short": "rustc 1.76.0-nightly (21cce21d8 2023-12-11)" + }, + "contractCrate": { + "name": "adder", + "version": "0.0.0" + }, + "framework": { + "name": "multiversx-sc", + "version": "0.47.0" + } + }, + "abi": { + "docs": [ + "One of the simplest smart contracts possible,", + "it holds a single variable in storage, which anyone can increment." + ], + "name": "Adder", + "constructor": { + "inputs": [ + { + "name": "initial_value", + "type": "BigUint" + } + ], + "outputs": [] + }, + "endpoints": [ + { + "name": "getSum", + "mutability": "readonly", + "inputs": [], + "outputs": [ + { + "type": "BigUint" + } + ] + }, + { + "name": "upgrade", + "mutability": "mutable", + "inputs": [ + { + "name": "initial_value", + "type": "BigUint" + } + ], + "outputs": [] + }, + { + "docs": [ + "Add desired amount to the storage variable." + ], + "name": "add", + "mutability": "mutable", + "inputs": [ + { + "name": "value", + "type": "BigUint" + } + ], + "outputs": [] + } + ], + "esdtAttributes": [], + "hasCallback": false, + "types": {} + }, + "size": 697, + "code": "0061736d010000000129086000006000017f60027f7f017f60027f7f0060017f0060037f7f7f017f60037f7f7f0060017f017f0290020b03656e7619626967496e74476574556e7369676e6564417267756d656e74000303656e760f6765744e756d417267756d656e7473000103656e760b7369676e616c4572726f72000303656e76126d42756666657253746f726167654c6f6164000203656e76176d427566666572546f426967496e74556e7369676e6564000203656e76196d42756666657246726f6d426967496e74556e7369676e6564000203656e76136d42756666657253746f7261676553746f7265000203656e760f6d4275666665725365744279746573000503656e760e636865636b4e6f5061796d656e74000003656e7614626967496e7446696e697368556e7369676e6564000403656e7609626967496e744164640006030b0a010104070301000000000503010003060f027f0041a080080b7f0041a080080b075008066d656d6f7279020004696e697400110667657453756d00120361646400130863616c6c4261636b0014077570677261646500110a5f5f646174615f656e6403000b5f5f686561705f6261736503010aca010a0e01017f4100100c2200100020000b1901017f419c8008419c800828020041016b220036020020000b1400100120004604400f0b4180800841191002000b16002000100c220010031a2000100c220010041a20000b1401017f100c2202200110051a2000200210061a0b1301017f100c220041998008410310071a20000b1401017f10084101100d100b210010102000100f0b0e0010084100100d1010100e10090b2201037f10084101100d100b210110102202100e220020002001100a20022000100f0b0300010b0b2f0200418080080b1c77726f6e67206e756d626572206f6620617267756d656e747373756d00419c80080b049cffffff" +} diff --git a/contracts/examples/multisig/test-contracts/adder.wasm b/contracts/examples/multisig/test-contracts/adder.wasm deleted file mode 100755 index ffb39b0d4e26f071164fbc6fac3f4800246f37ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 697 zcmZuvO>dh(5S`g2n6M3OVyl&-9w?{wlv~fmQe9Q5qDX1aur_OK*+8^FE1&RB$Td<9 z{XP9t?k?a+m3m-z=e;*?J_Lv=M*zSNP6Chswh3w5{)7ZuNNC%|<}v`b@3A@HxtV(Oh(N^rbH^?(v9O()FPHeN`b}kT8f8wAu37H{e!ND z*hau#g}@;IHZ|e%!7<-^0ugRQ_(%*h0geI8txrCS4q7nf1lViMbh-3;cv$+uCfY^A zBtU+qhA`RGOHM942Vdk36r6Q6m&9o^Ce=iKAxEJWIBpw}ShA>m%A u>uPg1AYBFpWb8(_s~cl)f2p#_f}+V6QU&EI5W`PZReDusFlId;kH^3K_p3et diff --git a/contracts/examples/multisig/test-contracts/factorial.mxsc.json b/contracts/examples/multisig/test-contracts/factorial.mxsc.json new file mode 100644 index 0000000000..d6f4559d83 --- /dev/null +++ b/contracts/examples/multisig/test-contracts/factorial.mxsc.json @@ -0,0 +1,54 @@ +{ + "buildInfo": { + "rustc": { + "version": "1.76.0-nightly", + "commitHash": "21cce21d8c012f14cf74d5afddd795d324600dac", + "commitDate": "2023-12-11", + "channel": "Nightly", + "short": "rustc 1.76.0-nightly (21cce21d8 2023-12-11)" + }, + "contractCrate": { + "name": "factorial", + "version": "0.0.0" + }, + "framework": { + "name": "multiversx-sc", + "version": "0.47.0" + } + }, + "abi": { + "name": "Factorial", + "constructor": { + "inputs": [], + "outputs": [] + }, + "endpoints": [ + { + "name": "upgrade", + "mutability": "mutable", + "inputs": [], + "outputs": [] + }, + { + "name": "factorial", + "mutability": "mutable", + "inputs": [ + { + "name": "value", + "type": "BigUint" + } + ], + "outputs": [ + { + "type": "BigUint" + } + ] + } + ], + "esdtAttributes": [], + "hasCallback": false, + "types": {} + }, + "size": 577, + "code": "0061736d010000000127086000006000017f60027f7f0060037f7f7f0060017f0060027f7e0060017f017f60027f7f017f02cf010a03656e760e626967496e74536574496e743634000503656e7619626967496e74476574556e7369676e6564417267756d656e74000203656e760f6765744e756d417267756d656e7473000103656e760b7369676e616c4572726f72000203656e760e636865636b4e6f5061796d656e74000003656e760a626967496e745369676e000603656e7609626967496e74436d70000703656e7609626967496e744d756c000303656e7609626967496e74416464000303656e7614626967496e7446696e697368556e7369676e656400040307060101040000000503010003060f027f0041a080080b7f0041a080080b074d07066d656d6f7279020004696e6974000d09666163746f7269616c000e0863616c6c4261636b000f0775706772616465000d0a5f5f646174615f656e6403000b5f5f686561705f6261736503010a9f01060e01017f100b22004201100020000b1901017f419c8008419c800828020041016b220036020020000b1400100220004604400f0b4180800841191003000b080010044100100c0b5201047f10044101100c4100100b2200100120002103100a210220001005047f100a2101100a2100037f20002003100641004a047f200105200120012000100720002000200210080c010b0b0520020b10090b0300010b0b2c0200418080080b1977726f6e67206e756d626572206f6620617267756d656e747300419c80080b049cffffff" +} diff --git a/contracts/examples/multisig/test-contracts/factorial.wasm b/contracts/examples/multisig/test-contracts/factorial.wasm deleted file mode 100755 index 5b8b3f50a951085a29dbfdc04e614a1f2f5abbb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 772 zcmZ8fO^?$s5S?+-ERCtwU2&k|;_aOq;*4AER=bGh1mc#ujoS?*PL(*j+6yVm_xGJ2 z!VL-W2lz|aO}_T;V4vNd0QS{I`orEvz2>mt z#MXgz_13BW_jHKtqvH>W^@~RxSVM0e(X%v%<^X+Pz(~~G7xn2KfzJg#>>wxhNA_;j z9j(}7?_GWqDCLBGa5*IwJj2z!0eviuQQ5+%n46rNLh5p+3O=iJT=I)Va>;eB?=Iw( boTSR}QnfXAaX#a6^XUEog!I$* From c1a8c1975ce8d4aa0d5d9b1bac8eea4dc41d5f3d Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Wed, 24 Jan 2024 22:32:38 +0200 Subject: [PATCH 69/84] test fix --- .../tests/rust_testing_framework_tester_scenario_rs_test.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs b/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs index c50fb02fff..18aac012c7 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs +++ b/contracts/feature-tests/rust-testing-framework-tester/tests/rust_testing_framework_tester_scenario_rs_test.rs @@ -6,7 +6,7 @@ fn world() -> ScenarioWorld { .set_current_dir_from_workspace("contracts/feature-tests/rust-testing-framework-tester"); blockchain.register_contract( - "mxsc:output/rust-testing-framework-tester.mxsc.json", + "file:output/rust-testing-framework-tester.wasm", rust_testing_framework_tester::ContractBuilder, ); blockchain From a4d0df7750f83903f9910cd1a53c9a39063fda53 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Wed, 24 Jan 2024 22:36:53 +0200 Subject: [PATCH 70/84] github action - template test fix --- .github/workflows/template-test-current.yml | 19 ++++--------------- .github/workflows/template-test-released.yml | 19 ++++--------------- 2 files changed, 8 insertions(+), 30 deletions(-) diff --git a/.github/workflows/template-test-current.yml b/.github/workflows/template-test-current.yml index 9832ef2212..35ea55d925 100644 --- a/.github/workflows/template-test-current.yml +++ b/.github/workflows/template-test-current.yml @@ -25,25 +25,14 @@ jobs: toolchain: nightly-2023-12-11 target: wasm32-unknown-unknown - - name: Setup the PATH variable - run: | - echo "PATH=$HOME/.local/bin:$HOME/multiversx-sdk/vmtools:$PATH" >> $GITHUB_ENV - - name: Install prerequisites run: | - pip3 install multiversx-sdk-cli==v6.0.0 - mkdir $HOME/multiversx-sdk - python3 -m multiversx_sdk_cli.cli deps install vmtools --tag v1.4.60 - - wget -O binaryen.tar.gz https://github.com/WebAssembly/binaryen/releases/download/version_112/binaryen-version_112-x86_64-linux.tar.gz - tar -xf binaryen.tar.gz - cp binaryen-version_112/bin/wasm-opt $HOME/.local/bin - - sudo apt install -y wabt=1.0.27-1 + cargo install wasm-opt + cargo install --path framework/meta + sc-meta install mx-scenario-go --tag v2.0.0 which wasm-opt - which wasm2wat - which run-scenarios + which mx-scenario-go - name: Run template tool test run: | diff --git a/.github/workflows/template-test-released.yml b/.github/workflows/template-test-released.yml index 88f409d24f..243b573556 100644 --- a/.github/workflows/template-test-released.yml +++ b/.github/workflows/template-test-released.yml @@ -25,25 +25,14 @@ jobs: toolchain: nightly-2023-12-11 target: wasm32-unknown-unknown - - name: Setup the PATH variable - run: | - echo "PATH=$HOME/.local/bin:$HOME/multiversx-sdk/vmtools:$PATH" >> $GITHUB_ENV - - name: Install prerequisites run: | - pip3 install multiversx-sdk-cli==v6.0.0 - mkdir $HOME/multiversx-sdk - python3 -m multiversx_sdk_cli.cli deps install vmtools --tag v1.4.60 - - wget -O binaryen.tar.gz https://github.com/WebAssembly/binaryen/releases/download/version_112/binaryen-version_112-x86_64-linux.tar.gz - tar -xf binaryen.tar.gz - cp binaryen-version_112/bin/wasm-opt $HOME/.local/bin - - sudo apt install -y wabt=1.0.27-1 + cargo install wasm-opt + cargo install --path framework/meta + sc-meta install mx-scenario-go --tag v2.0.0 which wasm-opt - which wasm2wat - which run-scenarios + which mx-scenario-go - name: Run template tool test run: | From e7c80e0736133dae7780bd826551e470c8df3ca8 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Thu, 25 Jan 2024 00:54:59 +0200 Subject: [PATCH 71/84] template - replace mxsc file names --- .github/workflows/template-test-current.yml | 1 + .github/workflows/template-test-released.yml | 1 + .../standalone/template/template_adjuster.rs | 33 +++++++++++++------ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.github/workflows/template-test-current.yml b/.github/workflows/template-test-current.yml index 35ea55d925..457a91435a 100644 --- a/.github/workflows/template-test-current.yml +++ b/.github/workflows/template-test-current.yml @@ -33,6 +33,7 @@ jobs: which wasm-opt which mx-scenario-go + mx-scenario-go --version - name: Run template tool test run: | diff --git a/.github/workflows/template-test-released.yml b/.github/workflows/template-test-released.yml index 243b573556..8d60860f08 100644 --- a/.github/workflows/template-test-released.yml +++ b/.github/workflows/template-test-released.yml @@ -33,6 +33,7 @@ jobs: which wasm-opt which mx-scenario-go + mx-scenario-go --version - name: Run template tool test run: | diff --git a/framework/meta/src/cmd/standalone/template/template_adjuster.rs b/framework/meta/src/cmd/standalone/template/template_adjuster.rs index 5252446d50..6751fb175c 100644 --- a/framework/meta/src/cmd/standalone/template/template_adjuster.rs +++ b/framework/meta/src/cmd/standalone/template/template_adjuster.rs @@ -163,19 +163,14 @@ impl TemplateAdjuster { let old_wasm = wasm_file_name(&self.metadata.name); let new_wasm = wasm_file_name(&self.target.new_name); - replace_in_files( - &self.target.contract_dir(), - "*.scen.json", - &[Query::substring(&old_wasm, &new_wasm)][..], - ); + let old_mxsc = mxsc_file_name(&self.metadata.name); + let new_mxsc = mxsc_file_name(&self.target.new_name); - replace_in_files( - &self.target.contract_dir(), - "*.steps.json", - &[Query::substring(&old_wasm, &new_wasm)][..], - ); + self.rename_in_scenarios(&old_wasm, &new_wasm); + self.rename_in_scenarios(&old_mxsc, &new_mxsc); queries.push(Query::substring(&old_wasm, &new_wasm)); + queries.push(Query::substring(&old_mxsc, &new_mxsc)); replace_in_files( &self.target.contract_dir().join(TEST_DIRECTORY), @@ -184,6 +179,20 @@ impl TemplateAdjuster { ); } + fn rename_in_scenarios(&self, old: &str, new: &str) { + replace_in_files( + &self.target.contract_dir(), + "*.scen.json", + &[Query::substring(old, new)][..], + ); + + replace_in_files( + &self.target.contract_dir(), + "*.steps.json", + &[Query::substring(old, new)][..], + ); + } + fn rename_solution_files(&self) { let new_name = self.target.new_name.to_case(Case::Snake); let new_src_name = rs_file_name(&new_name); @@ -200,6 +209,10 @@ fn wasm_file_name(name: &str) -> String { format!("{name}.wasm",) } +fn mxsc_file_name(name: &str) -> String { + format!("{name}.mxsc.json",) +} + fn rs_file_name(name: &str) -> String { format!("{name}.rs",) } From 8b911478d9ec9b95066c9a6352285cf2ce2d201f Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Fri, 26 Jan 2024 12:12:02 +0100 Subject: [PATCH 72/84] start impl get code metadata for vm rust --- framework/base/src/api/blockchain_api.rs | 4 +++- .../src/api/uncallable/blockchain_api_uncallable.rs | 4 ++++ .../src/contract_base/wrappers/blockchain_wrapper.rs | 9 ++++++--- .../scenario/src/api/core_api_vh/blockchain_api_vh.rs | 8 ++++++++ framework/wasm-adapter/src/api/blockchain_api_node.rs | 11 +++++++++++ vm/src/vm_hooks/vh_dispatcher.rs | 4 ++-- vm/src/vm_hooks/vh_handler/vh_blockchain.rs | 11 ++++++++++- 7 files changed, 44 insertions(+), 7 deletions(-) diff --git a/framework/base/src/api/blockchain_api.rs b/framework/base/src/api/blockchain_api.rs index a879c8cdce..2d156456c1 100644 --- a/framework/base/src/api/blockchain_api.rs +++ b/framework/base/src/api/blockchain_api.rs @@ -1,7 +1,7 @@ use super::{HandleTypeInfo, ManagedTypeApi, ManagedTypeApiImpl, RawHandle}; use crate::types::{ heap::{Address, Box, H256}, - EsdtLocalRoleFlags, + CodeMetadata, EsdtLocalRoleFlags, }; pub trait BlockchainApi: ManagedTypeApi { @@ -61,6 +61,8 @@ pub trait BlockchainApiImpl: ManagedTypeApiImpl { self.load_balance_legacy(dest, &address); } + fn get_code_metadata(&self, address_handle: Self::ManagedBufferHandle) -> CodeMetadata; + fn load_state_root_hash_managed(&self, dest: Self::ManagedBufferHandle); fn get_tx_hash_legacy(&self) -> H256; diff --git a/framework/base/src/api/uncallable/blockchain_api_uncallable.rs b/framework/base/src/api/uncallable/blockchain_api_uncallable.rs index 03d7d61aa5..8820a973d7 100644 --- a/framework/base/src/api/uncallable/blockchain_api_uncallable.rs +++ b/framework/base/src/api/uncallable/blockchain_api_uncallable.rs @@ -157,4 +157,8 @@ impl BlockchainApiImpl for UncallableApi { ) -> crate::types::EsdtLocalRoleFlags { unreachable!() } + + fn get_code_metadata(&self, _address_handle: Self::ManagedBufferHandle) -> crate::types::CodeMetadata { + unreachable!() + } } diff --git a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs index f39f803b06..cba1027808 100644 --- a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs +++ b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs @@ -10,9 +10,7 @@ use crate::{ err_msg::{ONLY_OWNER_CALLER, ONLY_USER_ACCOUNT_CALLER}, storage::{self}, types::{ - BackTransfers, BigUint, EgldOrEsdtTokenIdentifier, EsdtLocalRoleFlags, EsdtTokenData, - EsdtTokenType, ManagedAddress, ManagedBuffer, ManagedByteArray, ManagedType, ManagedVec, - TokenIdentifier, + BackTransfers, BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EsdtLocalRoleFlags, EsdtTokenData, EsdtTokenType, ManagedAddress, ManagedBuffer, ManagedByteArray, ManagedType, ManagedVec, TokenIdentifier }, }; @@ -135,6 +133,11 @@ where BigUint::from_handle(handle) } + #[inline] + pub fn get_code_metadata(&self, address: &ManagedAddress) -> CodeMetadata { + A::blockchain_api_impl().get_code_metadata(address.get_handle()) + } + #[inline] pub fn get_sc_balance(&self, token: &EgldOrEsdtTokenIdentifier, nonce: u64) -> BigUint { token.map_ref_or_else( diff --git a/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs b/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs index 03c3861bf5..4b7fb7f334 100644 --- a/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs +++ b/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs @@ -267,4 +267,12 @@ impl BlockchainApiImpl for VMHooksApi { multiversx_sc::types::EsdtLocalRoleFlags::from_bits_retain(result as u64) } + + fn get_code_metadata( + &self, + address_handle: Self::ManagedBufferHandle, + ) -> multiversx_sc::types::CodeMetadata { + let result = + self.with_vm_hooks(|vh| vh.managed_get_code_metadata(address_handle.get_raw_handle())); + } } diff --git a/framework/wasm-adapter/src/api/blockchain_api_node.rs b/framework/wasm-adapter/src/api/blockchain_api_node.rs index e5a5d55f79..1a62beecbc 100644 --- a/framework/wasm-adapter/src/api/blockchain_api_node.rs +++ b/framework/wasm-adapter/src/api/blockchain_api_node.rs @@ -83,6 +83,8 @@ extern "C" { fn managedIsESDTLimitedTransfer(tokenIDHandle: i32) -> i32; fn getESDTLocalRoles(tokenhandle: i32) -> i64; + + fn managedGetCodeMetadata(address_handle: i32) -> u16; } impl BlockchainApi for VmApiImpl { @@ -360,4 +362,13 @@ impl BlockchainApiImpl for VmApiImpl { getESDTLocalRoles(token_id_handle) } as u64) } + + fn get_code_metadata( + &self, + address_handle: Self::ManagedBufferHandle, + ) -> multiversx_sc::types::CodeMetadata { + multiversx_sc::types::CodeMetadata::from_bits_retain(unsafe { + managedGetCodeMetadata(address_handle) + }) + } } diff --git a/vm/src/vm_hooks/vh_dispatcher.rs b/vm/src/vm_hooks/vh_dispatcher.rs index 539e1170ca..d0e8bde6de 100644 --- a/vm/src/vm_hooks/vh_dispatcher.rs +++ b/vm/src/vm_hooks/vh_dispatcher.rs @@ -938,8 +938,8 @@ impl VMHooks for VMHooksDispatcher { self.handler.mb_to_hex(source_handle, dest_handle); } - fn managed_get_code_metadata(&self, address_handle: i32, response_handle: i32) { - panic!("Unavailable: managed_get_code_metadata") + fn managed_get_code_metadata(&self, address_handle: i32) -> crate::types::VMCodeMetadata { + self.handler.get_code_metadata(address_handle) } fn managed_is_builtin_function(&self, function_name_handle: i32) -> i32 { diff --git a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs index f6f722d6e8..96e8f28961 100644 --- a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs +++ b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs @@ -1,5 +1,5 @@ use crate::{ - types::{EsdtLocalRole, EsdtLocalRoleFlags, RawHandle, VMAddress}, + types::{EsdtLocalRole, EsdtLocalRoleFlags, RawHandle, VMAddress, VMCodeMetadata}, vm_hooks::VMHooksHandlerSource, world_mock::{EsdtData, EsdtInstance}, }; @@ -138,6 +138,15 @@ pub trait VMHooksBlockchain: VMHooksHandlerSource { self.m_types_lock().bi_overwrite(dest, esdt_balance.into()); } + fn get_code_metadata( + &self, + address_handle: RawHandle, + ) -> VMCodeMetadata { + let address = VMAddress::from_slice(self.m_types_lock().mb_get(address_handle)); + let data = self.account_data(&address).unwrap(); + data.code_metadata + } + #[allow(clippy::too_many_arguments)] fn managed_get_esdt_token_data( &self, From 38f37eb17f2739bdd0cc997cee54d205d58efd80 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 26 Jan 2024 14:10:14 +0200 Subject: [PATCH 73/84] get code metadata api & hook --- .../scenarios/get_code_metadata.scen.json | 61 +++++++++++++++++++ .../src/blockchain_api_features.rs | 5 ++ .../tests/basic_features_scenario_go_test.rs | 10 +++ .../tests/basic_features_scenario_rs_test.rs | 10 +++ .../basic-features/wasm/src/lib.rs | 5 +- framework/base/src/api/blockchain_api.rs | 10 ++- .../uncallable/blockchain_api_uncallable.rs | 6 +- .../wrappers/blockchain_wrapper.rs | 11 +++- .../src/api/core_api_vh/blockchain_api_vh.rs | 13 ++-- .../src/api/blockchain_api_node.rs | 13 ++-- vm/src/vm_hooks/vh_dispatcher.rs | 5 +- vm/src/vm_hooks/vh_handler/vh_blockchain.rs | 18 +++--- 12 files changed, 140 insertions(+), 27 deletions(-) create mode 100644 contracts/feature-tests/basic-features/scenarios/get_code_metadata.scen.json diff --git a/contracts/feature-tests/basic-features/scenarios/get_code_metadata.scen.json b/contracts/feature-tests/basic-features/scenarios/get_code_metadata.scen.json new file mode 100644 index 0000000000..832caa8950 --- /dev/null +++ b/contracts/feature-tests/basic-features/scenarios/get_code_metadata.scen.json @@ -0,0 +1,61 @@ +{ + "steps": [ + { + "step": "setState", + "accounts": { + "sc:basic-features": { + "nonce": "0", + "balance": "0", + "code": "mxsc:../output/basic-features.mxsc.json", + "codeMetadata": "0x0104" + }, + "address:an_account": { + "nonce": "0", + "balance": "0" + } + } + }, + { + "step": "scCall", + "id": "get_code_metadata", + "tx": { + "from": "address:an_account", + "to": "sc:basic-features", + "function": "get_code_metadata", + "arguments": [ + "sc:basic-features" + ], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [ + "0x0104" + ], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + }, + { + "step": "scCall", + "id": "get_code_metadata-missing-address", + "tx": { + "from": "address:an_account", + "to": "sc:basic-features", + "function": "get_code_metadata", + "arguments": [ + "sc:missing" + ], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [], + "status": "10", + "message": "str:account not found: 000000000000000000006d697373696e675f5f5f5f5f5f5f5f5f5f5f5f5f5f5f" + } + } + ] +} diff --git a/contracts/feature-tests/basic-features/src/blockchain_api_features.rs b/contracts/feature-tests/basic-features/src/blockchain_api_features.rs index 73538d8aca..60a8b39257 100644 --- a/contracts/feature-tests/basic-features/src/blockchain_api_features.rs +++ b/contracts/feature-tests/basic-features/src/blockchain_api_features.rs @@ -42,4 +42,9 @@ pub trait BlockchainApiFeatures { fn get_cumulated_validator_rewards(&self) -> BigUint { self.blockchain().get_cumulated_validator_rewards() } + + #[endpoint] + fn get_code_metadata(&self, address: ManagedAddress) -> CodeMetadata { + self.blockchain().get_code_metadata(&address) + } } diff --git a/contracts/feature-tests/basic-features/tests/basic_features_scenario_go_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_scenario_go_test.rs index ab96b331d6..2256c160ae 100644 --- a/contracts/feature-tests/basic-features/tests/basic_features_scenario_go_test.rs +++ b/contracts/feature-tests/basic-features/tests/basic_features_scenario_go_test.rs @@ -199,6 +199,11 @@ fn get_caller_go() { world().run("scenarios/get_caller.scen.json"); } +#[test] +fn get_code_metadata_go() { + world().run("scenarios/get_code_metadata.scen.json"); +} + #[test] fn get_cumulated_validator_rewards_go() { world().run("scenarios/get_cumulated_validator_rewards.scen.json"); @@ -356,6 +361,11 @@ fn storage_mapper_fungible_token_go() { world().run("scenarios/storage_mapper_fungible_token.scen.json"); } +#[test] +fn storage_mapper_get_at_address_go() { + world().run("scenarios/storage_mapper_get_at_address.scen.json"); +} + #[test] fn storage_mapper_linked_list_go() { world().run("scenarios/storage_mapper_linked_list.scen.json"); diff --git a/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs index 69532177c9..47a916f629 100644 --- a/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs +++ b/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs @@ -215,6 +215,11 @@ fn get_caller_rs() { world().run("scenarios/get_caller.scen.json"); } +#[test] +fn get_code_metadata_rs() { + world().run("scenarios/get_code_metadata.scen.json"); +} + #[test] fn get_cumulated_validator_rewards_rs() { world().run("scenarios/get_cumulated_validator_rewards.scen.json"); @@ -374,6 +379,11 @@ fn storage_mapper_fungible_token_rs() { world().run("scenarios/storage_mapper_fungible_token.scen.json"); } +#[test] +fn storage_mapper_get_at_address_rs() { + world().run("scenarios/storage_mapper_get_at_address.scen.json"); +} + #[test] fn storage_mapper_linked_list_rs() { world().run("scenarios/storage_mapper_linked_list.scen.json"); diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs index 2cf279041e..d7ac445e27 100644 --- a/contracts/feature-tests/basic-features/wasm/src/lib.rs +++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs @@ -5,9 +5,9 @@ //////////////////////////////////////////////////// // Init: 1 -// Endpoints: 373 +// Endpoints: 374 // Async Callback: 1 -// Total number of exported functions: 375 +// Total number of exported functions: 376 #![no_std] #![allow(internal_features)] @@ -129,6 +129,7 @@ multiversx_sc_wasm_adapter::endpoints! { get_tx_hash => get_tx_hash get_gas_left => get_gas_left get_cumulated_validator_rewards => get_cumulated_validator_rewards + get_code_metadata => get_code_metadata codec_err_finish => codec_err_finish codec_err_storage_key => codec_err_storage_key codec_err_storage_get => codec_err_storage_get diff --git a/framework/base/src/api/blockchain_api.rs b/framework/base/src/api/blockchain_api.rs index 2d156456c1..a429196b96 100644 --- a/framework/base/src/api/blockchain_api.rs +++ b/framework/base/src/api/blockchain_api.rs @@ -1,7 +1,7 @@ use super::{HandleTypeInfo, ManagedTypeApi, ManagedTypeApiImpl, RawHandle}; use crate::types::{ heap::{Address, Box, H256}, - CodeMetadata, EsdtLocalRoleFlags, + EsdtLocalRoleFlags, }; pub trait BlockchainApi: ManagedTypeApi { @@ -61,8 +61,6 @@ pub trait BlockchainApiImpl: ManagedTypeApiImpl { self.load_balance_legacy(dest, &address); } - fn get_code_metadata(&self, address_handle: Self::ManagedBufferHandle) -> CodeMetadata; - fn load_state_root_hash_managed(&self, dest: Self::ManagedBufferHandle); fn get_tx_hash_legacy(&self) -> H256; @@ -148,4 +146,10 @@ pub trait BlockchainApiImpl: ManagedTypeApiImpl { &self, token_id_handle: Self::ManagedBufferHandle, ) -> EsdtLocalRoleFlags; + + fn managed_get_code_metadata( + &self, + address_handle: Self::ManagedBufferHandle, + response_handle: Self::ManagedBufferHandle, + ); } diff --git a/framework/base/src/api/uncallable/blockchain_api_uncallable.rs b/framework/base/src/api/uncallable/blockchain_api_uncallable.rs index 8820a973d7..8a5fec0f62 100644 --- a/framework/base/src/api/uncallable/blockchain_api_uncallable.rs +++ b/framework/base/src/api/uncallable/blockchain_api_uncallable.rs @@ -158,7 +158,11 @@ impl BlockchainApiImpl for UncallableApi { unreachable!() } - fn get_code_metadata(&self, _address_handle: Self::ManagedBufferHandle) -> crate::types::CodeMetadata { + fn managed_get_code_metadata( + &self, + _address_handle: Self::ManagedBufferHandle, + _response_handle: Self::ManagedBufferHandle, + ) { unreachable!() } } diff --git a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs index cba1027808..4c3f558dcd 100644 --- a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs +++ b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs @@ -10,7 +10,9 @@ use crate::{ err_msg::{ONLY_OWNER_CALLER, ONLY_USER_ACCOUNT_CALLER}, storage::{self}, types::{ - BackTransfers, BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EsdtLocalRoleFlags, EsdtTokenData, EsdtTokenType, ManagedAddress, ManagedBuffer, ManagedByteArray, ManagedType, ManagedVec, TokenIdentifier + BackTransfers, BigUint, CodeMetadata, EgldOrEsdtTokenIdentifier, EsdtLocalRoleFlags, + EsdtTokenData, EsdtTokenType, ManagedAddress, ManagedBuffer, ManagedByteArray, ManagedType, + ManagedVec, TokenIdentifier, }, }; @@ -135,7 +137,12 @@ where #[inline] pub fn get_code_metadata(&self, address: &ManagedAddress) -> CodeMetadata { - A::blockchain_api_impl().get_code_metadata(address.get_handle()) + let mbuf_temp_1: A::ManagedBufferHandle = use_raw_handle(const_handles::MBUF_TEMPORARY_1); + A::blockchain_api_impl() + .managed_get_code_metadata(address.get_handle(), mbuf_temp_1.clone()); + let mut buffer = [0u8; 2]; + ManagedBuffer::::from_handle(mbuf_temp_1).load_to_byte_array(&mut buffer); + CodeMetadata::from(buffer) } #[inline] diff --git a/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs b/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs index 4b7fb7f334..d5066af0dc 100644 --- a/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs +++ b/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs @@ -268,11 +268,16 @@ impl BlockchainApiImpl for VMHooksApi { multiversx_sc::types::EsdtLocalRoleFlags::from_bits_retain(result as u64) } - fn get_code_metadata( + fn managed_get_code_metadata( &self, address_handle: Self::ManagedBufferHandle, - ) -> multiversx_sc::types::CodeMetadata { - let result = - self.with_vm_hooks(|vh| vh.managed_get_code_metadata(address_handle.get_raw_handle())); + response_handle: Self::ManagedBufferHandle, + ) { + self.with_vm_hooks(|vh| { + vh.managed_get_code_metadata( + address_handle.get_raw_handle_unchecked(), + response_handle.get_raw_handle_unchecked(), + ) + }); } } diff --git a/framework/wasm-adapter/src/api/blockchain_api_node.rs b/framework/wasm-adapter/src/api/blockchain_api_node.rs index 1a62beecbc..c9aa00d915 100644 --- a/framework/wasm-adapter/src/api/blockchain_api_node.rs +++ b/framework/wasm-adapter/src/api/blockchain_api_node.rs @@ -84,7 +84,7 @@ extern "C" { fn getESDTLocalRoles(tokenhandle: i32) -> i64; - fn managedGetCodeMetadata(address_handle: i32) -> u16; + fn managedGetCodeMetadata(addressHandle: i32, resultHandle: i32); } impl BlockchainApi for VmApiImpl { @@ -363,12 +363,13 @@ impl BlockchainApiImpl for VmApiImpl { } as u64) } - fn get_code_metadata( + fn managed_get_code_metadata( &self, address_handle: Self::ManagedBufferHandle, - ) -> multiversx_sc::types::CodeMetadata { - multiversx_sc::types::CodeMetadata::from_bits_retain(unsafe { - managedGetCodeMetadata(address_handle) - }) + response_handle: Self::ManagedBufferHandle, + ) { + unsafe { + managedGetCodeMetadata(address_handle, response_handle); + } } } diff --git a/vm/src/vm_hooks/vh_dispatcher.rs b/vm/src/vm_hooks/vh_dispatcher.rs index d0e8bde6de..33a7e47ad7 100644 --- a/vm/src/vm_hooks/vh_dispatcher.rs +++ b/vm/src/vm_hooks/vh_dispatcher.rs @@ -938,8 +938,9 @@ impl VMHooks for VMHooksDispatcher { self.handler.mb_to_hex(source_handle, dest_handle); } - fn managed_get_code_metadata(&self, address_handle: i32) -> crate::types::VMCodeMetadata { - self.handler.get_code_metadata(address_handle) + fn managed_get_code_metadata(&self, address_handle: i32, response_handle: i32) { + self.handler + .managed_get_code_metadata(address_handle, response_handle); } fn managed_is_builtin_function(&self, function_name_handle: i32) -> i32 { diff --git a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs index 96e8f28961..0f0c937a2b 100644 --- a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs +++ b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs @@ -1,5 +1,5 @@ use crate::{ - types::{EsdtLocalRole, EsdtLocalRoleFlags, RawHandle, VMAddress, VMCodeMetadata}, + types::{EsdtLocalRole, EsdtLocalRoleFlags, RawHandle, VMAddress}, vm_hooks::VMHooksHandlerSource, world_mock::{EsdtData, EsdtInstance}, }; @@ -138,13 +138,17 @@ pub trait VMHooksBlockchain: VMHooksHandlerSource { self.m_types_lock().bi_overwrite(dest, esdt_balance.into()); } - fn get_code_metadata( - &self, - address_handle: RawHandle, - ) -> VMCodeMetadata { + fn managed_get_code_metadata(&self, address_handle: i32, response_handle: i32) { let address = VMAddress::from_slice(self.m_types_lock().mb_get(address_handle)); - let data = self.account_data(&address).unwrap(); - data.code_metadata + let Some(data) = self.account_data(&address) else { + self.vm_error(&format!( + "account not found: {}", + hex::encode(address.as_bytes()) + )) + }; + let code_metadata_bytes = data.code_metadata.to_byte_array(); + self.m_types_lock() + .mb_set(response_handle, code_metadata_bytes.to_vec()) } #[allow(clippy::too_many_arguments)] From adcb20c2c3b65269d9ef19779d278a0713bd8d43 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Fri, 26 Jan 2024 14:10:23 +0200 Subject: [PATCH 74/84] cargo fmt --- .../benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs | 5 ++++- .../benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs | 5 ++++- .../benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs | 5 ++++- contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs | 5 ++++- contracts/examples/adder/interact/src/adder_interact.rs | 6 ++++-- .../examples/factorial/tests/factorial_scenario_rs_test.rs | 5 ++++- .../examples/multisig/tests/multisig_scenario_rs_test.rs | 5 ++++- .../nft-minter/tests/nft_minter_scenario_rs_test.rs | 5 ++++- .../proxy-pause/tests/proxy_pause_scenario_rs_test.rs | 5 ++++- .../composability/tests/promises_feature_blackbox_test.rs | 3 ++- .../tests/crowdfunding_erc20_scenario_rs_test.rs | 5 ++++- .../lottery-erc20/tests/lottery_erc20_scenario_rs_test.rs | 5 ++++- .../use-module/tests/use_module_scenario_rs_test.rs | 5 ++++- 13 files changed, 50 insertions(+), 14 deletions(-) diff --git a/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs index d1d78e6cb1..8ae30eaf45 100644 --- a/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/mappers/map-repeat/tests/scenario_rs_test.rs @@ -4,7 +4,10 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/map-repeat"); - blockchain.register_contract("mxsc:output/map-repeat.mxsc.json", map_repeat::ContractBuilder); + blockchain.register_contract( + "mxsc:output/map-repeat.mxsc.json", + map_repeat::ContractBuilder, + ); blockchain } diff --git a/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs index 77f5338006..ba9fda4f46 100644 --- a/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/mappers/set-repeat/tests/scenario_rs_test.rs @@ -4,7 +4,10 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/set-repeat"); - blockchain.register_contract("mxsc:output/set-repeat.mxsc.json", set_repeat::ContractBuilder); + blockchain.register_contract( + "mxsc:output/set-repeat.mxsc.json", + set_repeat::ContractBuilder, + ); blockchain } diff --git a/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs index 220f3e55fa..49407163df 100644 --- a/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/mappers/vec-repeat/tests/scenario_rs_test.rs @@ -4,7 +4,10 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/benchmarks/mappers/vec-repeat"); - blockchain.register_contract("mxsc:output/vec-repeat.mxsc.json", vec_repeat::ContractBuilder); + blockchain.register_contract( + "mxsc:output/vec-repeat.mxsc.json", + vec_repeat::ContractBuilder, + ); blockchain } diff --git a/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs b/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs index 741a494df1..42f585f314 100644 --- a/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs +++ b/contracts/benchmarks/str-repeat/tests/scenario_rs_test.rs @@ -2,7 +2,10 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); - blockchain.register_contract("mxsc:output/str-repeat.mxsc.json", str_repeat::ContractBuilder); + blockchain.register_contract( + "mxsc:output/str-repeat.mxsc.json", + str_repeat::ContractBuilder, + ); blockchain } diff --git a/contracts/examples/adder/interact/src/adder_interact.rs b/contracts/examples/adder/interact/src/adder_interact.rs index a0ed636947..10df4ddf61 100644 --- a/contracts/examples/adder/interact/src/adder_interact.rs +++ b/contracts/examples/adder/interact/src/adder_interact.rs @@ -69,8 +69,10 @@ impl AdderInteract { .with_tracer(INTERACTOR_SCENARIO_TRACE_PATH) .await; let wallet_address = interactor.register_wallet(test_wallets::mike()); - let adder_code = - BytesValue::interpret_from("mxsc:../output/adder.mxsc.json", &InterpreterContext::default()); + let adder_code = BytesValue::interpret_from( + "mxsc:../output/adder.mxsc.json", + &InterpreterContext::default(), + ); Self { interactor, diff --git a/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs b/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs index 7fe36b98bf..5f55080950 100644 --- a/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs +++ b/contracts/examples/factorial/tests/factorial_scenario_rs_test.rs @@ -4,7 +4,10 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/factorial"); - blockchain.register_contract("mxsc:output/factorial.mxsc.json", factorial::ContractBuilder); + blockchain.register_contract( + "mxsc:output/factorial.mxsc.json", + factorial::ContractBuilder, + ); blockchain } diff --git a/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs b/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs index 4687c335e1..8a606bffd8 100644 --- a/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs +++ b/contracts/examples/multisig/tests/multisig_scenario_rs_test.rs @@ -17,7 +17,10 @@ fn world() -> ScenarioWorld { "multisig-view", ); - blockchain.register_contract("mxsc:test-contracts/adder.mxsc.json", adder::ContractBuilder); + blockchain.register_contract( + "mxsc:test-contracts/adder.mxsc.json", + adder::ContractBuilder, + ); blockchain.register_contract( "mxsc:test-contracts/factorial.mxsc.json", diff --git a/contracts/examples/nft-minter/tests/nft_minter_scenario_rs_test.rs b/contracts/examples/nft-minter/tests/nft_minter_scenario_rs_test.rs index f0e564a249..db79559f43 100644 --- a/contracts/examples/nft-minter/tests/nft_minter_scenario_rs_test.rs +++ b/contracts/examples/nft-minter/tests/nft_minter_scenario_rs_test.rs @@ -4,7 +4,10 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/nft-minter"); - blockchain.register_contract("mxsc:output/nft-minter.mxsc.json", nft_minter::ContractBuilder); + blockchain.register_contract( + "mxsc:output/nft-minter.mxsc.json", + nft_minter::ContractBuilder, + ); blockchain } diff --git a/contracts/examples/proxy-pause/tests/proxy_pause_scenario_rs_test.rs b/contracts/examples/proxy-pause/tests/proxy_pause_scenario_rs_test.rs index 874c939739..41c563d7c7 100644 --- a/contracts/examples/proxy-pause/tests/proxy_pause_scenario_rs_test.rs +++ b/contracts/examples/proxy-pause/tests/proxy_pause_scenario_rs_test.rs @@ -4,7 +4,10 @@ fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); blockchain.set_current_dir_from_workspace("contracts/examples/proxy-pause"); - blockchain.register_contract("mxsc:output/proxy-pause.mxsc.json", proxy_pause::ContractBuilder); + blockchain.register_contract( + "mxsc:output/proxy-pause.mxsc.json", + proxy_pause::ContractBuilder, + ); blockchain.register_contract( "mxsc:../check-pause/output/check-pause.mxsc.json", diff --git a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs index 78084581b0..a2ee00c631 100644 --- a/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs +++ b/contracts/feature-tests/composability/tests/promises_feature_blackbox_test.rs @@ -9,7 +9,8 @@ use promises_features::call_sync_bt::ProxyTrait; const USER_ADDRESS_EXPR: &str = "address:user"; const PROMISES_FEATURE_ADDRESS_EXPR: &str = "sc:promises-feature"; -const PROMISES_FEATURES_PATH_EXPR: &str = "mxsc:promises-features/output/promises-feature.mxsc.json"; +const PROMISES_FEATURES_PATH_EXPR: &str = + "mxsc:promises-features/output/promises-feature.mxsc.json"; const VAULT_ADDRESS_EXPR: &str = "sc:vault"; const VAULT_PATH_EXPR: &str = "mxsc:../vault/output/vault.mxsc.json"; diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/tests/crowdfunding_erc20_scenario_rs_test.rs b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/tests/crowdfunding_erc20_scenario_rs_test.rs index 189a41f27c..e14767b48f 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/tests/crowdfunding_erc20_scenario_rs_test.rs +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/tests/crowdfunding_erc20_scenario_rs_test.rs @@ -11,7 +11,10 @@ fn world() -> ScenarioWorld { crowdfunding_erc20::ContractBuilder, ); - blockchain.register_contract("mxsc:../erc20/output/erc20.mxsc.json", erc20::ContractBuilder); + blockchain.register_contract( + "mxsc:../erc20/output/erc20.mxsc.json", + erc20::ContractBuilder, + ); blockchain } diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/tests/lottery_erc20_scenario_rs_test.rs b/contracts/feature-tests/erc-style-contracts/lottery-erc20/tests/lottery_erc20_scenario_rs_test.rs index 7d958d67f8..ed82fb71bb 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/tests/lottery_erc20_scenario_rs_test.rs +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/tests/lottery_erc20_scenario_rs_test.rs @@ -11,7 +11,10 @@ fn world() -> ScenarioWorld { lottery_erc20::ContractBuilder, ); - blockchain.register_contract("mxsc:../erc20/output/erc20.mxsc.json", erc20::ContractBuilder); + blockchain.register_contract( + "mxsc:../erc20/output/erc20.mxsc.json", + erc20::ContractBuilder, + ); blockchain } diff --git a/contracts/feature-tests/use-module/tests/use_module_scenario_rs_test.rs b/contracts/feature-tests/use-module/tests/use_module_scenario_rs_test.rs index 0b48711aa5..2ecb798d24 100644 --- a/contracts/feature-tests/use-module/tests/use_module_scenario_rs_test.rs +++ b/contracts/feature-tests/use-module/tests/use_module_scenario_rs_test.rs @@ -33,7 +33,10 @@ use multiversx_sc_scenario::*; fn world() -> ScenarioWorld { let mut blockchain = ScenarioWorld::new(); - blockchain.register_contract("mxsc:output/use-module.mxsc.json", use_module::ContractBuilder); + blockchain.register_contract( + "mxsc:output/use-module.mxsc.json", + use_module::ContractBuilder, + ); blockchain.register_contract( "mxsc:test-wasm/elrond-wasm-sc-dns.mxsc.json", From 3d1a87a38d1a9d9804cce1e192ca909f18da0a29 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Sun, 28 Jan 2024 22:24:05 +0200 Subject: [PATCH 75/84] scenario fmt --- .../scenarios/stress_submit_test.scen.json | 103 ----- ...ss_submit_with_gas_schedule_test.scen.json | 412 +++++------------- .../scenarios/interactor_trace.scen.json | 20 +- .../scenarios/interactor_wegld.scen.json | 60 +-- .../scenarios/big_uint_pow.scen.json | 6 +- .../scenarios/small_num_overflow.scen.json | 35 +- .../storage_mapper_get_at_address.scen.json | 2 +- .../promises_single_transfer.scen.json | 8 +- 8 files changed, 144 insertions(+), 502 deletions(-) diff --git a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json index f14a5ef684..72d06e6316 100644 --- a/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json +++ b/contracts/core/price-aggregator/scenarios/stress_submit_test.scen.json @@ -220,7 +220,6 @@ }, { "step": "scDeploy", - "id": "", "tx": { "from": "address:owner", "contractCode": "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json", @@ -290,7 +289,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle1", "to": "sc:price-aggregator", @@ -306,7 +304,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle2", "to": "sc:price-aggregator", @@ -322,7 +319,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle3", "to": "sc:price-aggregator", @@ -338,7 +334,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle4", "to": "sc:price-aggregator", @@ -354,7 +349,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle5", "to": "sc:price-aggregator", @@ -370,7 +364,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle6", "to": "sc:price-aggregator", @@ -386,7 +379,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle7", "to": "sc:price-aggregator", @@ -402,7 +394,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle8", "to": "sc:price-aggregator", @@ -418,7 +409,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle9", "to": "sc:price-aggregator", @@ -434,7 +424,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle10", "to": "sc:price-aggregator", @@ -450,7 +439,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle11", "to": "sc:price-aggregator", @@ -466,7 +454,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle12", "to": "sc:price-aggregator", @@ -482,7 +469,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle13", "to": "sc:price-aggregator", @@ -498,7 +484,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle14", "to": "sc:price-aggregator", @@ -514,7 +499,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle15", "to": "sc:price-aggregator", @@ -530,7 +514,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle16", "to": "sc:price-aggregator", @@ -546,7 +529,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle17", "to": "sc:price-aggregator", @@ -562,7 +544,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle18", "to": "sc:price-aggregator", @@ -578,7 +559,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle19", "to": "sc:price-aggregator", @@ -594,7 +574,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle20", "to": "sc:price-aggregator", @@ -610,7 +589,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle21", "to": "sc:price-aggregator", @@ -626,7 +604,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle22", "to": "sc:price-aggregator", @@ -642,7 +619,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle23", "to": "sc:price-aggregator", @@ -658,7 +634,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle24", "to": "sc:price-aggregator", @@ -674,7 +649,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle25", "to": "sc:price-aggregator", @@ -690,7 +664,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle26", "to": "sc:price-aggregator", @@ -706,7 +679,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle27", "to": "sc:price-aggregator", @@ -722,7 +694,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle28", "to": "sc:price-aggregator", @@ -738,7 +709,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle29", "to": "sc:price-aggregator", @@ -754,7 +724,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle30", "to": "sc:price-aggregator", @@ -770,7 +739,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle31", "to": "sc:price-aggregator", @@ -786,7 +754,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle32", "to": "sc:price-aggregator", @@ -802,7 +769,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle33", "to": "sc:price-aggregator", @@ -818,7 +784,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle34", "to": "sc:price-aggregator", @@ -834,7 +799,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle35", "to": "sc:price-aggregator", @@ -850,7 +814,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle36", "to": "sc:price-aggregator", @@ -866,7 +829,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle37", "to": "sc:price-aggregator", @@ -882,7 +844,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle38", "to": "sc:price-aggregator", @@ -898,7 +859,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle39", "to": "sc:price-aggregator", @@ -914,7 +874,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle40", "to": "sc:price-aggregator", @@ -930,7 +889,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle41", "to": "sc:price-aggregator", @@ -946,7 +904,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle42", "to": "sc:price-aggregator", @@ -962,7 +919,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle43", "to": "sc:price-aggregator", @@ -978,7 +934,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle44", "to": "sc:price-aggregator", @@ -994,7 +949,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle45", "to": "sc:price-aggregator", @@ -1010,7 +964,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle46", "to": "sc:price-aggregator", @@ -1026,7 +979,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle47", "to": "sc:price-aggregator", @@ -1042,7 +994,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle48", "to": "sc:price-aggregator", @@ -1058,7 +1009,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle49", "to": "sc:price-aggregator", @@ -1074,7 +1024,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle50", "to": "sc:price-aggregator", @@ -1090,7 +1039,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:owner", "to": "sc:price-aggregator", @@ -1109,7 +1057,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:owner", "to": "sc:price-aggregator", @@ -1124,7 +1071,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle1", "to": "sc:price-aggregator", @@ -1145,7 +1091,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle2", "to": "sc:price-aggregator", @@ -1166,7 +1111,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle3", "to": "sc:price-aggregator", @@ -1187,7 +1131,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle4", "to": "sc:price-aggregator", @@ -1208,7 +1151,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle5", "to": "sc:price-aggregator", @@ -1229,7 +1171,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle6", "to": "sc:price-aggregator", @@ -1250,7 +1191,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle7", "to": "sc:price-aggregator", @@ -1271,7 +1211,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle8", "to": "sc:price-aggregator", @@ -1292,7 +1231,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle9", "to": "sc:price-aggregator", @@ -1313,7 +1251,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle10", "to": "sc:price-aggregator", @@ -1334,7 +1271,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle11", "to": "sc:price-aggregator", @@ -1355,7 +1291,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle12", "to": "sc:price-aggregator", @@ -1376,7 +1311,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle13", "to": "sc:price-aggregator", @@ -1397,7 +1331,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle14", "to": "sc:price-aggregator", @@ -1418,7 +1351,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle15", "to": "sc:price-aggregator", @@ -1439,7 +1371,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle16", "to": "sc:price-aggregator", @@ -1460,7 +1391,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle17", "to": "sc:price-aggregator", @@ -1481,7 +1411,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle18", "to": "sc:price-aggregator", @@ -1502,7 +1431,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle19", "to": "sc:price-aggregator", @@ -1523,7 +1451,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle20", "to": "sc:price-aggregator", @@ -1544,7 +1471,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle21", "to": "sc:price-aggregator", @@ -1565,7 +1491,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle22", "to": "sc:price-aggregator", @@ -1586,7 +1511,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle23", "to": "sc:price-aggregator", @@ -1607,7 +1531,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle24", "to": "sc:price-aggregator", @@ -1628,7 +1551,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle25", "to": "sc:price-aggregator", @@ -1649,7 +1571,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle26", "to": "sc:price-aggregator", @@ -1670,7 +1591,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle27", "to": "sc:price-aggregator", @@ -1691,7 +1611,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle28", "to": "sc:price-aggregator", @@ -1712,7 +1631,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle29", "to": "sc:price-aggregator", @@ -1733,7 +1651,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle30", "to": "sc:price-aggregator", @@ -1754,7 +1671,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle31", "to": "sc:price-aggregator", @@ -1775,7 +1691,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle32", "to": "sc:price-aggregator", @@ -1796,7 +1711,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle33", "to": "sc:price-aggregator", @@ -1817,7 +1731,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle34", "to": "sc:price-aggregator", @@ -1838,7 +1751,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle35", "to": "sc:price-aggregator", @@ -1859,7 +1771,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle36", "to": "sc:price-aggregator", @@ -1880,7 +1791,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle37", "to": "sc:price-aggregator", @@ -1901,7 +1811,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle38", "to": "sc:price-aggregator", @@ -1922,7 +1831,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle39", "to": "sc:price-aggregator", @@ -1943,7 +1851,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle40", "to": "sc:price-aggregator", @@ -1964,7 +1871,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle41", "to": "sc:price-aggregator", @@ -1985,7 +1891,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle42", "to": "sc:price-aggregator", @@ -2006,7 +1911,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle43", "to": "sc:price-aggregator", @@ -2027,7 +1931,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle44", "to": "sc:price-aggregator", @@ -2048,7 +1951,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle45", "to": "sc:price-aggregator", @@ -2069,7 +1971,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle46", "to": "sc:price-aggregator", @@ -2090,7 +1991,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle47", "to": "sc:price-aggregator", @@ -2111,7 +2011,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle48", "to": "sc:price-aggregator", @@ -2132,7 +2031,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle49", "to": "sc:price-aggregator", @@ -2153,7 +2051,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle50", "to": "sc:price-aggregator", diff --git a/contracts/core/price-aggregator/scenarios/stress_submit_with_gas_schedule_test.scen.json b/contracts/core/price-aggregator/scenarios/stress_submit_with_gas_schedule_test.scen.json index 1b2181b41a..efb66e491a 100644 --- a/contracts/core/price-aggregator/scenarios/stress_submit_with_gas_schedule_test.scen.json +++ b/contracts/core/price-aggregator/scenarios/stress_submit_with_gas_schedule_test.scen.json @@ -223,7 +223,6 @@ }, { "step": "scDeploy", - "id": "", "tx": { "from": "address:owner", "contractCode": "mxsc:../output/multiversx-price-aggregator-sc.mxsc.json", @@ -284,8 +283,7 @@ "0x6f7261636c6534395f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f", "0x6f7261636c6535305f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f5f" ], - "gasLimit": "120,000,000", - "gasPrice": "" + "gasLimit": "120,000,000" }, "expect": { "out": [], @@ -295,15 +293,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle1", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -313,15 +309,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle2", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -331,15 +325,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle3", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -349,15 +341,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle4", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -367,15 +357,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle5", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -385,15 +373,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle6", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -403,15 +389,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle7", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -421,15 +405,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle8", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -439,15 +421,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle9", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -457,15 +437,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle10", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -475,15 +453,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle11", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -493,15 +469,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle12", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -511,15 +485,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle13", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -529,15 +501,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle14", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -547,15 +517,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle15", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -565,15 +533,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle16", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -583,15 +549,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle17", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -601,15 +565,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle18", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -619,15 +581,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle19", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -637,15 +597,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle20", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -655,15 +613,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle21", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -673,15 +629,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle22", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -691,15 +645,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle23", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -709,15 +661,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle24", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -727,15 +677,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle25", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -745,15 +693,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle26", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -763,15 +709,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle27", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -781,15 +725,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle28", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -799,15 +741,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle29", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -817,15 +757,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle30", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -835,15 +773,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle31", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -853,15 +789,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle32", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -871,15 +805,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle33", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -889,15 +821,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle34", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -907,15 +837,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle35", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -925,15 +853,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle36", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -943,15 +869,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle37", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -961,15 +885,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle38", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -979,15 +901,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle39", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -997,15 +917,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle40", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1015,15 +933,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle41", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1033,15 +949,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle42", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1051,15 +965,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle43", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1069,15 +981,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle44", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1087,15 +997,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle45", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1105,15 +1013,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle46", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1123,15 +1029,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle47", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1141,15 +1045,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle48", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1159,15 +1061,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle49", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1177,15 +1077,13 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle50", "to": "sc:price-aggregator", "egldValue": "20", "function": "stake", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1195,7 +1093,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:owner", "to": "sc:price-aggregator", @@ -1205,8 +1102,7 @@ "0x55534443", "0x" ], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1216,14 +1112,12 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:owner", "to": "sc:price-aggregator", "function": "unpause", "arguments": [], - "gasLimit": "5,000,000", - "gasPrice": "" + "gasLimit": "5,000,000" }, "expect": { "out": [], @@ -1233,7 +1127,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle1", "to": "sc:price-aggregator", @@ -1245,8 +1138,7 @@ "0x619911dbb570258c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1256,7 +1148,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle2", "to": "sc:price-aggregator", @@ -1268,8 +1159,7 @@ "0x3cf8d3d3a05bf655", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1279,7 +1169,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle3", "to": "sc:price-aggregator", @@ -1291,8 +1180,7 @@ "0x4d92440172e0bf71", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1302,7 +1190,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle4", "to": "sc:price-aggregator", @@ -1314,8 +1201,7 @@ "0xd971ed41066daa08", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1325,7 +1211,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle5", "to": "sc:price-aggregator", @@ -1337,8 +1222,7 @@ "0x34a9348cb04afbd1", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1348,7 +1232,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle6", "to": "sc:price-aggregator", @@ -1360,8 +1243,7 @@ "0x6c01a77d55c0861f", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1371,7 +1253,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle7", "to": "sc:price-aggregator", @@ -1383,8 +1264,7 @@ "0xea1e93f2b82ec0f6", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1394,7 +1274,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle8", "to": "sc:price-aggregator", @@ -1406,8 +1285,7 @@ "0x2f067fee00bbd5bc", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1417,7 +1295,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle9", "to": "sc:price-aggregator", @@ -1429,8 +1306,7 @@ "0x1706fe5397a21f74", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1440,7 +1316,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle10", "to": "sc:price-aggregator", @@ -1452,8 +1327,7 @@ "0xbffd5631e9e448a8", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1463,7 +1337,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle11", "to": "sc:price-aggregator", @@ -1475,8 +1348,7 @@ "0x1940496d3bc8934c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1486,7 +1358,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle12", "to": "sc:price-aggregator", @@ -1498,8 +1369,7 @@ "0xbd0af0d3aba30235", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1509,7 +1379,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle13", "to": "sc:price-aggregator", @@ -1521,8 +1390,7 @@ "0xebcf9494ec0fac0c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1532,7 +1400,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle14", "to": "sc:price-aggregator", @@ -1544,8 +1411,7 @@ "0x7aeb67c3eabe498c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1555,7 +1421,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle15", "to": "sc:price-aggregator", @@ -1567,8 +1432,7 @@ "0x5c758d17b8445f7f", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1578,7 +1442,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle16", "to": "sc:price-aggregator", @@ -1590,8 +1453,7 @@ "0x6978fe48b9a58974", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1601,7 +1463,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle17", "to": "sc:price-aggregator", @@ -1613,8 +1474,7 @@ "0x8692c26f665bc7ad", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1624,7 +1484,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle18", "to": "sc:price-aggregator", @@ -1636,8 +1495,7 @@ "0x2d3a93b7522e72b6", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1647,7 +1505,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle19", "to": "sc:price-aggregator", @@ -1659,8 +1516,7 @@ "0x4faa49415e935688", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1670,7 +1526,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle20", "to": "sc:price-aggregator", @@ -1682,8 +1537,7 @@ "0x5cbca2cc253dbf54", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1693,7 +1547,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle21", "to": "sc:price-aggregator", @@ -1705,8 +1558,7 @@ "0xdd20d194dd695735", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1716,7 +1568,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle22", "to": "sc:price-aggregator", @@ -1728,8 +1579,7 @@ "0x32f039c1765a2ec3", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1739,7 +1589,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle23", "to": "sc:price-aggregator", @@ -1751,8 +1600,7 @@ "0x84372c9de3d535d9", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1762,7 +1610,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle24", "to": "sc:price-aggregator", @@ -1774,8 +1621,7 @@ "0x91b23ed59de93417", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1785,7 +1631,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle25", "to": "sc:price-aggregator", @@ -1797,8 +1642,7 @@ "0x4b81d1a55887f5f9", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1808,7 +1652,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle26", "to": "sc:price-aggregator", @@ -1820,8 +1663,7 @@ "0xd88e348ef6679e1d", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1831,7 +1673,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle27", "to": "sc:price-aggregator", @@ -1843,8 +1684,7 @@ "0x2557834dc8059cc7", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1854,7 +1694,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle28", "to": "sc:price-aggregator", @@ -1866,8 +1705,7 @@ "0x22d86f8317546033", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1877,7 +1715,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle29", "to": "sc:price-aggregator", @@ -1889,8 +1726,7 @@ "0x5a775ddd32ca5367", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1900,7 +1736,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle30", "to": "sc:price-aggregator", @@ -1912,8 +1747,7 @@ "0x59f049471cd2662c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1923,7 +1757,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle31", "to": "sc:price-aggregator", @@ -1935,8 +1768,7 @@ "0xb59fdc2aedbf845f", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1946,7 +1778,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle32", "to": "sc:price-aggregator", @@ -1958,8 +1789,7 @@ "0xab13e96eb802f883", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1969,7 +1799,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle33", "to": "sc:price-aggregator", @@ -1981,8 +1810,7 @@ "0xf6f152ab53ad7170", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -1992,7 +1820,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle34", "to": "sc:price-aggregator", @@ -2004,8 +1831,7 @@ "0x5bae78b87d516979", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2015,7 +1841,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle35", "to": "sc:price-aggregator", @@ -2027,8 +1852,7 @@ "0xe47859cc0fdb0abe", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2038,7 +1862,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle36", "to": "sc:price-aggregator", @@ -2050,8 +1873,7 @@ "0x7c36ab1fa1a348b4", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2061,7 +1883,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle37", "to": "sc:price-aggregator", @@ -2073,8 +1894,7 @@ "0x7fda3ef39b74e04b", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2084,7 +1904,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle38", "to": "sc:price-aggregator", @@ -2096,8 +1915,7 @@ "0x461d81a84db50115", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2107,7 +1925,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle39", "to": "sc:price-aggregator", @@ -2119,8 +1936,7 @@ "0xcc0ab8ccc363dd0c", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2130,7 +1946,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle40", "to": "sc:price-aggregator", @@ -2142,8 +1957,7 @@ "0x11c15058c7c6c1fa", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2153,7 +1967,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle41", "to": "sc:price-aggregator", @@ -2165,8 +1978,7 @@ "0x293b700535555d4f", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2176,7 +1988,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle42", "to": "sc:price-aggregator", @@ -2188,8 +1999,7 @@ "0x4e8d04d2f0e53efd", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2199,7 +2009,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle43", "to": "sc:price-aggregator", @@ -2211,8 +2020,7 @@ "0x42be3651d7b9499e", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2222,7 +2030,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle44", "to": "sc:price-aggregator", @@ -2234,8 +2041,7 @@ "0xb82a437fc87cd8a0", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2245,7 +2051,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle45", "to": "sc:price-aggregator", @@ -2257,8 +2062,7 @@ "0xb12ebd0d9ff3f396", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2268,7 +2072,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle46", "to": "sc:price-aggregator", @@ -2280,8 +2083,7 @@ "0x85b4d01e5a20d445", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2291,7 +2093,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle47", "to": "sc:price-aggregator", @@ -2303,8 +2104,7 @@ "0x92edaca582002375", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2314,7 +2114,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle48", "to": "sc:price-aggregator", @@ -2326,8 +2125,7 @@ "0x351151b47fee6331", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2337,7 +2135,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle49", "to": "sc:price-aggregator", @@ -2349,8 +2146,7 @@ "0x9155d2992ceb6beb", "0x" ], - "gasLimit": "7,000,000", - "gasPrice": "" + "gasLimit": "7,000,000" }, "expect": { "out": [], @@ -2360,7 +2156,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "address:oracle50", "to": "sc:price-aggregator", @@ -2372,8 +2167,7 @@ "0xdbc0895ce5855dec", "0x" ], - "gasLimit": "50,000,000", - "gasPrice": "" + "gasLimit": "50,000,000" }, "expect": { "out": [], diff --git a/contracts/examples/adder/scenarios/interactor_trace.scen.json b/contracts/examples/adder/scenarios/interactor_trace.scen.json index fb077ddb6a..e0824697fe 100644 --- a/contracts/examples/adder/scenarios/interactor_trace.scen.json +++ b/contracts/examples/adder/scenarios/interactor_trace.scen.json @@ -11,8 +11,7 @@ "str:CAN-2abf4b": "1000", "str:CAN-6d39e6": "1000", "str:CAN-ac1592": "1000" - }, - "username": "" + } } } }, @@ -28,23 +27,21 @@ }, { "step": "scDeploy", - "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", "contractCode": "mxsc:../output/adder.mxsc.json", "arguments": [ "0x00" ], - "gasLimit": "70,000,000", - "gasPrice": "" + "gasLimit": "70,000,000" }, "expect": { + "out": [], "status": "0" } }, { "step": "scCall", - "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", "to": "0x0000000000000000050028600ceb73ac22ec0b6f257aff7bed74dffa3ebfed60", @@ -52,16 +49,15 @@ "arguments": [ "0x07" ], - "gasLimit": "70,000,000", - "gasPrice": "" + "gasLimit": "70,000,000" }, "expect": { + "out": [], "status": "0" } }, { "step": "scCall", - "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", "to": "0x0000000000000000050028600ceb73ac22ec0b6f257aff7bed74dffa3ebfed60", @@ -69,12 +65,12 @@ "arguments": [ "0x05" ], - "gasLimit": "70,000,000", - "gasPrice": "" + "gasLimit": "70,000,000" }, "expect": { + "out": [], "status": "0" } } ] -} \ No newline at end of file +} diff --git a/contracts/examples/multisig/scenarios/interactor_wegld.scen.json b/contracts/examples/multisig/scenarios/interactor_wegld.scen.json index a30e7e6112..15e9fc0386 100644 --- a/contracts/examples/multisig/scenarios/interactor_wegld.scen.json +++ b/contracts/examples/multisig/scenarios/interactor_wegld.scen.json @@ -11,8 +11,7 @@ "str:CAN-2abf4b": "1000", "str:CAN-6d39e6": "1000", "str:CAN-ac1592": "1000" - }, - "username": "" + } } } }, @@ -31,8 +30,7 @@ } ] } - }, - "username": "" + } } } }, @@ -41,8 +39,7 @@ "accounts": { "0xb13a017423c366caff8cecfb77a12610a130f4888134122c7937feae0d6d7d17": { "nonce": "179", - "balance": "7777023510140000000", - "username": "" + "balance": "7777023510140000000" } } }, @@ -56,8 +53,7 @@ "str:USDC-091bd3": "9997000000000", "str:XRF-079f0d": "999999805000000000000000000", "str:XUSDC-929b9b": "1000000000000000000000000" - }, - "username": "" + } } } }, @@ -69,14 +65,12 @@ "balance": "54039792195269569513", "esdt": { "str:WEGLD-6cf38e": { - "instances": [], "roles": [ "ESDTRoleLocalBurn", "ESDTRoleLocalMint" ] } }, - "username": "", "storage": { "0x7772617070656445676c64546f6b656e4964": "0x5745474c442d366366333865" }, @@ -96,7 +90,6 @@ }, { "step": "scDeploy", - "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", "contractCode": "mxsc:../output/multisig.mxsc.json", @@ -107,16 +100,15 @@ "0xb13a017423c366caff8cecfb77a12610a130f4888134122c7937feae0d6d7d17", "0x3af8d9c9423b2577c6252722c1d90212a4111f7203f9744f76fcfa1d0a310033" ], - "gasLimit": "70,000,000", - "gasPrice": "" + "gasLimit": "70,000,000" }, "expect": { + "out": [], "status": "0" } }, { "step": "transfer", - "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -126,7 +118,6 @@ }, { "step": "scCall", - "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -136,13 +127,11 @@ "0xb1a2bc2ec50000", "0x7772617045676c64" ], - "gasLimit": "10,000,000", - "gasPrice": "" + "gasLimit": "10,000,000" } }, { "step": "scCall", - "id": "", "tx": { "from": "0xb2a11555ce521e4944e09ab17549d85b487dcd26c84b5017a39e31a3670889ba", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -150,13 +139,11 @@ "arguments": [ "0x01" ], - "gasLimit": "15,000,000", - "gasPrice": "" + "gasLimit": "15,000,000" } }, { "step": "scCall", - "id": "", "tx": { "from": "0xb13a017423c366caff8cecfb77a12610a130f4888134122c7937feae0d6d7d17", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -164,13 +151,11 @@ "arguments": [ "0x01" ], - "gasLimit": "15,000,000", - "gasPrice": "" + "gasLimit": "15,000,000" } }, { "step": "scCall", - "id": "", "tx": { "from": "0x3af8d9c9423b2577c6252722c1d90212a4111f7203f9744f76fcfa1d0a310033", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -178,13 +163,11 @@ "arguments": [ "0x01" ], - "gasLimit": "15,000,000", - "gasPrice": "" + "gasLimit": "15,000,000" } }, { "step": "scCall", - "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -192,13 +175,11 @@ "arguments": [ "0x01" ], - "gasLimit": "15,000,000", - "gasPrice": "" + "gasLimit": "15,000,000" } }, { "step": "scCall", - "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -211,13 +192,11 @@ "0x58d15e17628000", "0x756e7772617045676c64" ], - "gasLimit": "10,000,000", - "gasPrice": "" + "gasLimit": "10,000,000" } }, { "step": "scCall", - "id": "", "tx": { "from": "0xb2a11555ce521e4944e09ab17549d85b487dcd26c84b5017a39e31a3670889ba", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -225,13 +204,11 @@ "arguments": [ "0x02" ], - "gasLimit": "15,000,000", - "gasPrice": "" + "gasLimit": "15,000,000" } }, { "step": "scCall", - "id": "", "tx": { "from": "0xb13a017423c366caff8cecfb77a12610a130f4888134122c7937feae0d6d7d17", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -239,13 +216,11 @@ "arguments": [ "0x02" ], - "gasLimit": "15,000,000", - "gasPrice": "" + "gasLimit": "15,000,000" } }, { "step": "scCall", - "id": "", "tx": { "from": "0x3af8d9c9423b2577c6252722c1d90212a4111f7203f9744f76fcfa1d0a310033", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -253,13 +228,11 @@ "arguments": [ "0x02" ], - "gasLimit": "15,000,000", - "gasPrice": "" + "gasLimit": "15,000,000" } }, { "step": "scCall", - "id": "", "tx": { "from": "0xe32afedc904fe1939746ad973beb383563cf63642ba669b3040f9b9428a5ed60", "to": "0x0000000000000000050013ee5923031e866a442d3cb543820bf74178bc7fed60", @@ -267,8 +240,7 @@ "arguments": [ "0x02" ], - "gasLimit": "15,000,000", - "gasPrice": "" + "gasLimit": "15,000,000" } } ] diff --git a/contracts/feature-tests/basic-features/scenarios/big_uint_pow.scen.json b/contracts/feature-tests/basic-features/scenarios/big_uint_pow.scen.json index 7a4ed72391..378068fe2e 100644 --- a/contracts/feature-tests/basic-features/scenarios/big_uint_pow.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/big_uint_pow.scen.json @@ -8,14 +8,11 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "storage": {}, "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", - "balance": "0", - "storage": {}, - "code": "" + "balance": "0" } } }, @@ -25,7 +22,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "pow_big_uint", "arguments": [ "10", diff --git a/contracts/feature-tests/basic-features/scenarios/small_num_overflow.scen.json b/contracts/feature-tests/basic-features/scenarios/small_num_overflow.scen.json index 2fc9de2183..d81ffc5306 100644 --- a/contracts/feature-tests/basic-features/scenarios/small_num_overflow.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/small_num_overflow.scen.json @@ -8,14 +8,11 @@ "sc:basic-features": { "nonce": "0", "balance": "0", - "storage": {}, "code": "mxsc:../output/basic-features.mxsc.json" }, "address:an_account": { "nonce": "0", - "balance": "0", - "storage": {}, - "code": "" + "balance": "0" } } }, @@ -25,13 +22,13 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "no_overflow_u8", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" }, "expect": { + "out": [], "status": "4", "message": "str:panic occurred", "logs": "*", @@ -45,7 +42,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "overflow_u8", "arguments": [], "gasLimit": "50,000,000", @@ -67,13 +63,13 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "no_overflow_i8", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" }, "expect": { + "out": [], "status": "4", "message": "str:panic occurred", "logs": "*", @@ -87,7 +83,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "overflow_i8", "arguments": [], "gasLimit": "50,000,000", @@ -109,13 +104,13 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "no_overflow_u16", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" }, "expect": { + "out": [], "status": "4", "message": "str:panic occurred", "logs": "*", @@ -129,7 +124,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "overflow_u16", "arguments": [], "gasLimit": "50,000,000", @@ -151,13 +145,13 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "no_overflow_i16", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" }, "expect": { + "out": [], "status": "4", "message": "str:panic occurred", "logs": "*", @@ -171,7 +165,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "overflow_i16", "arguments": [], "gasLimit": "50,000,000", @@ -193,13 +186,13 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "no_overflow_u32", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" }, "expect": { + "out": [], "status": "4", "message": "str:panic occurred", "logs": "*", @@ -213,7 +206,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "overflow_u32", "arguments": [], "gasLimit": "50,000,000", @@ -235,13 +227,13 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "no_overflow_i32", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" }, "expect": { + "out": [], "status": "4", "message": "str:panic occurred", "logs": "*", @@ -255,7 +247,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "overflow_i32", "arguments": [], "gasLimit": "50,000,000", @@ -277,13 +268,13 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "no_overflow_u64", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" }, "expect": { + "out": [], "status": "4", "message": "str:panic occurred", "logs": "*", @@ -297,7 +288,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "overflow_u64", "arguments": [], "gasLimit": "50,000,000", @@ -319,13 +309,13 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "no_overflow_i64", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" }, "expect": { + "out": [], "status": "4", "message": "str:panic occurred", "logs": "*", @@ -339,7 +329,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "overflow_i64", "arguments": [], "gasLimit": "50,000,000", @@ -361,13 +350,13 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "no_overflow_usize", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" }, "expect": { + "out": [], "status": "4", "message": "str:panic occurred", "logs": "*", @@ -381,7 +370,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "overflow_usize", "arguments": [], "gasLimit": "50,000,000", @@ -403,13 +391,13 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "no_overflow_isize", "arguments": [], "gasLimit": "50,000,000", "gasPrice": "0" }, "expect": { + "out": [], "status": "4", "message": "str:panic occurred", "logs": "*", @@ -423,7 +411,6 @@ "tx": { "from": "address:an_account", "to": "sc:basic-features", - "value": "0", "function": "overflow_isize", "arguments": [], "gasLimit": "50,000,000", diff --git a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json index 4a1a0ea1e7..7577d8d5ba 100644 --- a/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/storage_mapper_get_at_address.scen.json @@ -154,4 +154,4 @@ } } ] -} \ No newline at end of file +} diff --git a/contracts/feature-tests/composability/scenarios/promises_single_transfer.scen.json b/contracts/feature-tests/composability/scenarios/promises_single_transfer.scen.json index 642dfb3ff9..d1132485c4 100644 --- a/contracts/feature-tests/composability/scenarios/promises_single_transfer.scen.json +++ b/contracts/feature-tests/composability/scenarios/promises_single_transfer.scen.json @@ -93,7 +93,7 @@ { "address": "sc:promises", "endpoint": "str:transferValueOnly", - "topics": [ + "topics": [ "0", "sc:vault" ], @@ -107,7 +107,7 @@ { "address": "sc:vault", "endpoint": "str:transferValueOnly", - "topics": [ + "topics": [ "0", "sc:promises" ], @@ -188,7 +188,7 @@ { "address": "sc:promises", "endpoint": "str:transferValueOnly", - "topics": [ + "topics": [ "0", "sc:vault" ], @@ -202,7 +202,7 @@ { "address": "sc:vault", "endpoint": "str:transferValueOnly", - "topics": [ + "topics": [ "0", "sc:promises" ], From c3a69fdf4d365b7a1264157e19797e1a8f07c2ec Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 29 Jan 2024 09:45:41 +0200 Subject: [PATCH 76/84] get_code_metadata additional test --- .../scenarios/get_code_metadata.scen.json | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/contracts/feature-tests/basic-features/scenarios/get_code_metadata.scen.json b/contracts/feature-tests/basic-features/scenarios/get_code_metadata.scen.json index 832caa8950..fdd4d68cb1 100644 --- a/contracts/feature-tests/basic-features/scenarios/get_code_metadata.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/get_code_metadata.scen.json @@ -9,6 +9,12 @@ "code": "mxsc:../output/basic-features.mxsc.json", "codeMetadata": "0x0104" }, + "sc:basic-features-2": { + "nonce": "0", + "balance": "0", + "code": "mxsc:../output/basic-features.mxsc.json", + "codeMetadata": "0x0100" + }, "address:an_account": { "nonce": "0", "balance": "0" @@ -38,6 +44,29 @@ "refund": "*" } }, + { + "step": "scCall", + "id": "get_code_metadata-2", + "tx": { + "from": "address:an_account", + "to": "sc:basic-features", + "function": "get_code_metadata", + "arguments": [ + "sc:basic-features-2" + ], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [ + "0x0100" + ], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + }, { "step": "scCall", "id": "get_code_metadata-missing-address", From 74d9d486444dd2e558375956c850c50341635ce7 Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Mon, 29 Jan 2024 11:03:09 +0100 Subject: [PATCH 77/84] impl for is builtin function rust vm hook --- framework/base/src/api/blockchain_api.rs | 2 ++ .../uncallable/blockchain_api_uncallable.rs | 7 ++++ .../src/api/core_api_vh/blockchain_api_vh.rs | 6 ++++ .../src/api/blockchain_api_node.rs | 6 ++++ vm/src/vm_hooks/vh_dispatcher.rs | 4 +-- vm/src/vm_hooks/vh_handler/vh_blockchain.rs | 32 ++++++++++++++++++- 6 files changed, 54 insertions(+), 3 deletions(-) diff --git a/framework/base/src/api/blockchain_api.rs b/framework/base/src/api/blockchain_api.rs index a429196b96..e33beaaa4b 100644 --- a/framework/base/src/api/blockchain_api.rs +++ b/framework/base/src/api/blockchain_api.rs @@ -152,4 +152,6 @@ pub trait BlockchainApiImpl: ManagedTypeApiImpl { address_handle: Self::ManagedBufferHandle, response_handle: Self::ManagedBufferHandle, ); + + fn managed_is_builtin_function(&self, function_name_handle: Self::ManagedBufferHandle) -> bool; } diff --git a/framework/base/src/api/uncallable/blockchain_api_uncallable.rs b/framework/base/src/api/uncallable/blockchain_api_uncallable.rs index 8a5fec0f62..1838659a06 100644 --- a/framework/base/src/api/uncallable/blockchain_api_uncallable.rs +++ b/framework/base/src/api/uncallable/blockchain_api_uncallable.rs @@ -165,4 +165,11 @@ impl BlockchainApiImpl for UncallableApi { ) { unreachable!() } + + fn managed_is_builtin_function( + &self, + _function_name_handle: Self::ManagedBufferHandle, + ) -> bool { + unreachable!() + } } diff --git a/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs b/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs index d5066af0dc..825a38ca9b 100644 --- a/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs +++ b/framework/scenario/src/api/core_api_vh/blockchain_api_vh.rs @@ -268,6 +268,12 @@ impl BlockchainApiImpl for VMHooksApi { multiversx_sc::types::EsdtLocalRoleFlags::from_bits_retain(result as u64) } + fn managed_is_builtin_function(&self, function_name_handle: Self::ManagedBufferHandle) -> bool { + i32_to_bool(self.with_vm_hooks(|vh| { + vh.managed_is_builtin_function(function_name_handle.get_raw_handle_unchecked()) + })) + } + fn managed_get_code_metadata( &self, address_handle: Self::ManagedBufferHandle, diff --git a/framework/wasm-adapter/src/api/blockchain_api_node.rs b/framework/wasm-adapter/src/api/blockchain_api_node.rs index c9aa00d915..ab6d53fd24 100644 --- a/framework/wasm-adapter/src/api/blockchain_api_node.rs +++ b/framework/wasm-adapter/src/api/blockchain_api_node.rs @@ -85,6 +85,8 @@ extern "C" { fn getESDTLocalRoles(tokenhandle: i32) -> i64; fn managedGetCodeMetadata(addressHandle: i32, resultHandle: i32); + + fn managedIsBuiltinFunction(function_name_handle: i32) -> bool; } impl BlockchainApi for VmApiImpl { @@ -363,6 +365,10 @@ impl BlockchainApiImpl for VmApiImpl { } as u64) } + fn managed_is_builtin_function(&self, function_name_handle: Self::ManagedBufferHandle) -> bool { + unsafe { managedIsBuiltinFunction(function_name_handle) } + } + fn managed_get_code_metadata( &self, address_handle: Self::ManagedBufferHandle, diff --git a/vm/src/vm_hooks/vh_dispatcher.rs b/vm/src/vm_hooks/vh_dispatcher.rs index 33a7e47ad7..3c2179bb19 100644 --- a/vm/src/vm_hooks/vh_dispatcher.rs +++ b/vm/src/vm_hooks/vh_dispatcher.rs @@ -18,7 +18,7 @@ impl VMHooksDispatcher { } } -fn bool_to_i32(b: bool) -> i32 { +pub fn bool_to_i32(b: bool) -> i32 { if b { 1 } else { @@ -944,7 +944,7 @@ impl VMHooks for VMHooksDispatcher { } fn managed_is_builtin_function(&self, function_name_handle: i32) -> i32 { - panic!("Unavailable: managed_is_builtin_function") + self.handler.managed_is_builtin_function(function_name_handle) } fn big_float_new_from_parts( diff --git a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs index 0f0c937a2b..fad5a84952 100644 --- a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs +++ b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs @@ -1,6 +1,7 @@ use crate::{ + tx_execution::vm_builtin_function_names::*, types::{EsdtLocalRole, EsdtLocalRoleFlags, RawHandle, VMAddress}, - vm_hooks::VMHooksHandlerSource, + vm_hooks::{vh_dispatcher::bool_to_i32, VMHooksHandlerSource}, world_mock::{EsdtData, EsdtInstance}, }; use num_bigint::BigInt; @@ -8,6 +9,24 @@ use num_traits::Zero; // The Go VM doesn't do it, but if we change that, we can enable it easily here too via this constant. const ESDT_TOKEN_DATA_FUNC_RESETS_VALUES: bool = false; +const VM_BUILTIN_FUNCTIONS: [&str; 16] = [ + ESDT_LOCAL_MINT_FUNC_NAME, + ESDT_LOCAL_BURN_FUNC_NAME, + ESDT_MULTI_TRANSFER_FUNC_NAME, + ESDT_NFT_TRANSFER_FUNC_NAME, + ESDT_NFT_CREATE_FUNC_NAME, + ESDT_NFT_ADD_QUANTITY_FUNC_NAME, + ESDT_NFT_ADD_URI_FUNC_NAME, + ESDT_NFT_UPDATE_ATTRIBUTES_FUNC_NAME, + ESDT_NFT_BURN_FUNC_NAME, + ESDT_TRANSFER_FUNC_NAME, + CHANGE_OWNER_BUILTIN_FUNC_NAME, + CLAIM_DEVELOPER_REWARDS_FUNC_NAME, + SET_USERNAME_FUNC_NAME, + MIGRATE_USERNAME_FUNC_NAME, + DELETE_USERNAME_FUNC_NAME, + UPGRADE_CONTRACT_FUNC_NAME, +]; pub trait VMHooksBlockchain: VMHooksHandlerSource { fn is_contract_address(&self, address_bytes: &[u8]) -> bool { @@ -151,6 +170,17 @@ pub trait VMHooksBlockchain: VMHooksHandlerSource { .mb_set(response_handle, code_metadata_bytes.to_vec()) } + fn managed_is_builtin_function(&self, function_name_handle: i32) -> i32 { + bool_to_i32( + VM_BUILTIN_FUNCTIONS.contains( + &self + .m_types_lock() + .mb_to_function_name(function_name_handle) + .as_str(), + ), + ) + } + #[allow(clippy::too_many_arguments)] fn managed_get_esdt_token_data( &self, From 4b645291bed152737935cb583fcbfab5adc3c874 Mon Sep 17 00:00:00 2001 From: Mihai Calin Luca Date: Mon, 29 Jan 2024 11:53:52 +0100 Subject: [PATCH 78/84] added function in blockchain wrapper, added mandos tests, fmt --- .../scenarios/is_builtin_function.scen.json | 65 +++++++++++++++++++ .../src/blockchain_api_features.rs | 5 ++ ...ic_features_is_builtin_function_rs_test.rs | 18 +++++ .../wrappers/blockchain_wrapper.rs | 5 ++ .../src/api/blockchain_api_node.rs | 2 +- vm/src/vm_hooks/vh_dispatcher.rs | 3 +- 6 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 contracts/feature-tests/basic-features/scenarios/is_builtin_function.scen.json create mode 100644 contracts/feature-tests/basic-features/tests/basic_features_is_builtin_function_rs_test.rs diff --git a/contracts/feature-tests/basic-features/scenarios/is_builtin_function.scen.json b/contracts/feature-tests/basic-features/scenarios/is_builtin_function.scen.json new file mode 100644 index 0000000000..c5d405adde --- /dev/null +++ b/contracts/feature-tests/basic-features/scenarios/is_builtin_function.scen.json @@ -0,0 +1,65 @@ +{ + "steps": [ + { + "step": "setState", + "accounts": { + "sc:basic-features": { + "nonce": "0", + "balance": "0", + "code": "mxsc:../output/basic-features.mxsc.json", + "codeMetadata": "0x0104" + }, + "address:an_account": { + "nonce": "0", + "balance": "0" + } + } + }, + { + "step": "scCall", + "id": "is builtin function", + "tx": { + "from": "address:an_account", + "to": "sc:basic-features", + "function": "is_builtin_function", + "arguments": [ + "str:upgradeContract" + ], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [ + "0x01" + ], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + }, + { + "step": "scCall", + "id": "is builtin function", + "tx": { + "from": "address:an_account", + "to": "sc:basic-features", + "function": "is_builtin_function", + "arguments": [ + "str:anyFunction" + ], + "gasLimit": "50,000,000", + "gasPrice": "0" + }, + "expect": { + "out": [ + "0x" + ], + "status": "", + "logs": "*", + "gas": "*", + "refund": "*" + } + } + ] +} \ No newline at end of file diff --git a/contracts/feature-tests/basic-features/src/blockchain_api_features.rs b/contracts/feature-tests/basic-features/src/blockchain_api_features.rs index 60a8b39257..9f0545811f 100644 --- a/contracts/feature-tests/basic-features/src/blockchain_api_features.rs +++ b/contracts/feature-tests/basic-features/src/blockchain_api_features.rs @@ -47,4 +47,9 @@ pub trait BlockchainApiFeatures { fn get_code_metadata(&self, address: ManagedAddress) -> CodeMetadata { self.blockchain().get_code_metadata(&address) } + + #[endpoint] + fn is_builtin_function(&self, function_name: ManagedBuffer) -> bool { + self.blockchain().is_builtin_function(&function_name) + } } diff --git a/contracts/feature-tests/basic-features/tests/basic_features_is_builtin_function_rs_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_is_builtin_function_rs_test.rs new file mode 100644 index 0000000000..836cdd5a9c --- /dev/null +++ b/contracts/feature-tests/basic-features/tests/basic_features_is_builtin_function_rs_test.rs @@ -0,0 +1,18 @@ +use multiversx_sc_scenario::*; + +fn world() -> ScenarioWorld { + let mut blockchain = ScenarioWorld::new(); + blockchain.set_current_dir_from_workspace("contracts/feature-tests/basic-features"); + + blockchain.register_contract( + "mxsc:output/basic-features.mxsc.json", + basic_features::ContractBuilder, + ); + + blockchain +} + +#[test] +fn is_builtin_function_test() { + world().run("scenarios/is_builtin_function.scen.json"); +} diff --git a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs index 4c3f558dcd..01ce71d189 100644 --- a/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs +++ b/framework/base/src/contract_base/wrappers/blockchain_wrapper.rs @@ -145,6 +145,11 @@ where CodeMetadata::from(buffer) } + #[inline] + pub fn is_builtin_function(&self, function_name: &ManagedBuffer) -> bool { + A::blockchain_api_impl().managed_is_builtin_function(function_name.get_handle()) + } + #[inline] pub fn get_sc_balance(&self, token: &EgldOrEsdtTokenIdentifier, nonce: u64) -> BigUint { token.map_ref_or_else( diff --git a/framework/wasm-adapter/src/api/blockchain_api_node.rs b/framework/wasm-adapter/src/api/blockchain_api_node.rs index ab6d53fd24..0c72cacaf8 100644 --- a/framework/wasm-adapter/src/api/blockchain_api_node.rs +++ b/framework/wasm-adapter/src/api/blockchain_api_node.rs @@ -368,7 +368,7 @@ impl BlockchainApiImpl for VmApiImpl { fn managed_is_builtin_function(&self, function_name_handle: Self::ManagedBufferHandle) -> bool { unsafe { managedIsBuiltinFunction(function_name_handle) } } - + fn managed_get_code_metadata( &self, address_handle: Self::ManagedBufferHandle, diff --git a/vm/src/vm_hooks/vh_dispatcher.rs b/vm/src/vm_hooks/vh_dispatcher.rs index 3c2179bb19..cedcf7870a 100644 --- a/vm/src/vm_hooks/vh_dispatcher.rs +++ b/vm/src/vm_hooks/vh_dispatcher.rs @@ -944,7 +944,8 @@ impl VMHooks for VMHooksDispatcher { } fn managed_is_builtin_function(&self, function_name_handle: i32) -> i32 { - self.handler.managed_is_builtin_function(function_name_handle) + self.handler + .managed_is_builtin_function(function_name_handle) } fn big_float_new_from_parts( From 2352d6927307a08646e6f67f22f5dc1bddfce8d7 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 29 Jan 2024 13:21:50 +0200 Subject: [PATCH 79/84] is builtin function test fix --- .../scenarios/is_builtin_function.scen.json | 8 ++++---- .../tests/basic_features_scenario_go_test.rs | 5 +++++ .../tests/basic_features_scenario_rs_test.rs | 5 +++++ contracts/feature-tests/basic-features/wasm/src/lib.rs | 5 +++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/contracts/feature-tests/basic-features/scenarios/is_builtin_function.scen.json b/contracts/feature-tests/basic-features/scenarios/is_builtin_function.scen.json index c5d405adde..dde9bc8887 100644 --- a/contracts/feature-tests/basic-features/scenarios/is_builtin_function.scen.json +++ b/contracts/feature-tests/basic-features/scenarios/is_builtin_function.scen.json @@ -17,13 +17,13 @@ }, { "step": "scCall", - "id": "is builtin function", + "id": "is builtin function - true", "tx": { "from": "address:an_account", "to": "sc:basic-features", "function": "is_builtin_function", "arguments": [ - "str:upgradeContract" + "str:ESDTTransfer" ], "gasLimit": "50,000,000", "gasPrice": "0" @@ -40,7 +40,7 @@ }, { "step": "scCall", - "id": "is builtin function", + "id": "is builtin function - false", "tx": { "from": "address:an_account", "to": "sc:basic-features", @@ -62,4 +62,4 @@ } } ] -} \ No newline at end of file +} diff --git a/contracts/feature-tests/basic-features/tests/basic_features_scenario_go_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_scenario_go_test.rs index 2256c160ae..94a4a73811 100644 --- a/contracts/feature-tests/basic-features/tests/basic_features_scenario_go_test.rs +++ b/contracts/feature-tests/basic-features/tests/basic_features_scenario_go_test.rs @@ -215,6 +215,11 @@ fn get_shard_of_address_go() { world().run("scenarios/get_shard_of_address.scen.json"); } +#[test] +fn is_builtin_function_go() { + world().run("scenarios/is_builtin_function.scen.json"); +} + #[test] fn managed_address_array_go() { world().run("scenarios/managed_address_array.scen.json"); diff --git a/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs b/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs index 47a916f629..d66a52cbf4 100644 --- a/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs +++ b/contracts/feature-tests/basic-features/tests/basic_features_scenario_rs_test.rs @@ -230,6 +230,11 @@ fn get_shard_of_address_rs() { world().run("scenarios/get_shard_of_address.scen.json"); } +#[test] +fn is_builtin_function_rs() { + world().run("scenarios/is_builtin_function.scen.json"); +} + #[test] fn managed_address_array_rs() { world().run("scenarios/managed_address_array.scen.json"); diff --git a/contracts/feature-tests/basic-features/wasm/src/lib.rs b/contracts/feature-tests/basic-features/wasm/src/lib.rs index d7ac445e27..e546f06cab 100644 --- a/contracts/feature-tests/basic-features/wasm/src/lib.rs +++ b/contracts/feature-tests/basic-features/wasm/src/lib.rs @@ -5,9 +5,9 @@ //////////////////////////////////////////////////// // Init: 1 -// Endpoints: 374 +// Endpoints: 375 // Async Callback: 1 -// Total number of exported functions: 376 +// Total number of exported functions: 377 #![no_std] #![allow(internal_features)] @@ -130,6 +130,7 @@ multiversx_sc_wasm_adapter::endpoints! { get_gas_left => get_gas_left get_cumulated_validator_rewards => get_cumulated_validator_rewards get_code_metadata => get_code_metadata + is_builtin_function => is_builtin_function codec_err_finish => codec_err_finish codec_err_storage_key => codec_err_storage_key codec_err_storage_get => codec_err_storage_get From 5255ad7c72bb026d9bfc4fdfcf2402fed7e204f6 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 29 Jan 2024 13:24:04 +0200 Subject: [PATCH 80/84] cleanup --- vm/src/vm_hooks/vh_dispatcher.rs | 8 +++++--- vm/src/vm_hooks/vh_handler/vh_blockchain.rs | 16 +++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vm/src/vm_hooks/vh_dispatcher.rs b/vm/src/vm_hooks/vh_dispatcher.rs index cedcf7870a..0dbfc54051 100644 --- a/vm/src/vm_hooks/vh_dispatcher.rs +++ b/vm/src/vm_hooks/vh_dispatcher.rs @@ -18,7 +18,7 @@ impl VMHooksDispatcher { } } -pub fn bool_to_i32(b: bool) -> i32 { +fn bool_to_i32(b: bool) -> i32 { if b { 1 } else { @@ -944,8 +944,10 @@ impl VMHooks for VMHooksDispatcher { } fn managed_is_builtin_function(&self, function_name_handle: i32) -> i32 { - self.handler - .managed_is_builtin_function(function_name_handle) + bool_to_i32( + self.handler + .managed_is_builtin_function(function_name_handle), + ) } fn big_float_new_from_parts( diff --git a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs index fad5a84952..88d8f1b69c 100644 --- a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs +++ b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs @@ -1,7 +1,7 @@ use crate::{ tx_execution::vm_builtin_function_names::*, types::{EsdtLocalRole, EsdtLocalRoleFlags, RawHandle, VMAddress}, - vm_hooks::{vh_dispatcher::bool_to_i32, VMHooksHandlerSource}, + vm_hooks::VMHooksHandlerSource, world_mock::{EsdtData, EsdtInstance}, }; use num_bigint::BigInt; @@ -170,14 +170,12 @@ pub trait VMHooksBlockchain: VMHooksHandlerSource { .mb_set(response_handle, code_metadata_bytes.to_vec()) } - fn managed_is_builtin_function(&self, function_name_handle: i32) -> i32 { - bool_to_i32( - VM_BUILTIN_FUNCTIONS.contains( - &self - .m_types_lock() - .mb_to_function_name(function_name_handle) - .as_str(), - ), + fn managed_is_builtin_function(&self, function_name_handle: i32) -> bool { + VM_BUILTIN_FUNCTIONS.contains( + &self + .m_types_lock() + .mb_to_function_name(function_name_handle) + .as_str(), ) } From e0ad2fed74937593d229d087798d1af8dae95063 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 29 Jan 2024 13:25:06 +0200 Subject: [PATCH 81/84] cleanup --- vm/src/vm_hooks/vh_handler/vh_blockchain.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs index 88d8f1b69c..43940d4a57 100644 --- a/vm/src/vm_hooks/vh_handler/vh_blockchain.rs +++ b/vm/src/vm_hooks/vh_handler/vh_blockchain.rs @@ -9,7 +9,7 @@ use num_traits::Zero; // The Go VM doesn't do it, but if we change that, we can enable it easily here too via this constant. const ESDT_TOKEN_DATA_FUNC_RESETS_VALUES: bool = false; -const VM_BUILTIN_FUNCTIONS: [&str; 16] = [ +const VM_BUILTIN_FUNCTION_NAMES: [&str; 16] = [ ESDT_LOCAL_MINT_FUNC_NAME, ESDT_LOCAL_BURN_FUNC_NAME, ESDT_MULTI_TRANSFER_FUNC_NAME, @@ -171,7 +171,7 @@ pub trait VMHooksBlockchain: VMHooksHandlerSource { } fn managed_is_builtin_function(&self, function_name_handle: i32) -> bool { - VM_BUILTIN_FUNCTIONS.contains( + VM_BUILTIN_FUNCTION_NAMES.contains( &self .m_types_lock() .mb_to_function_name(function_name_handle) From 73dd0518ee9295fbad5e1393a9c78e39054a5a37 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 29 Jan 2024 14:09:09 +0200 Subject: [PATCH 82/84] dependency upgrades --- Cargo.lock | 75 ++++++++++++++++++----------------- data/codec-derive/Cargo.toml | 2 +- framework/base/Cargo.toml | 2 +- framework/derive/Cargo.toml | 2 +- framework/meta/Cargo.toml | 2 +- framework/snippets/Cargo.toml | 2 +- vm/Cargo.toml | 2 +- 7 files changed, 44 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8a5fe741b5..5b52e8dfc2 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -99,9 +99,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -277,9 +277,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block-buffer" @@ -774,17 +774,27 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + [[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -1426,17 +1436,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "is-terminal" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.52.0", -] - [[package]] name = "itertools" version = "0.12.0" @@ -1784,7 +1783,7 @@ dependencies = [ name = "multiversx-chain-vm" version = "0.8.0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "ed25519-dalek", "hex", "hex-literal", @@ -1829,7 +1828,7 @@ dependencies = [ name = "multiversx-sc" version = "0.47.0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "hex-literal", "multiversx-sc-codec", "multiversx-sc-derive", @@ -1887,7 +1886,7 @@ dependencies = [ "serde", "serde_json", "toml", - "wasmparser", + "wasmparser 0.120.0", "wasmprinter", "zip", ] @@ -2136,7 +2135,7 @@ version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if", "foreign-types", "libc", @@ -2360,9 +2359,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -2699,7 +2698,7 @@ version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", @@ -3060,15 +3059,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termcolor" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" -dependencies = [ - "winapi-util", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -3452,6 +3442,17 @@ dependencies = [ "semver", ] +[[package]] +name = "wasmparser" +version = "0.120.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9148127f39cbffe43efee8d5442b16ecdba21567785268daa1ec9e134389705" +dependencies = [ + "bitflags 2.4.2", + "indexmap", + "semver", +] + [[package]] name = "wasmprinter" version = "0.2.75" @@ -3459,7 +3460,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d027eb8294904fc715ac0870cebe6b0271e96b90605ee21511e7565c4ce568c" dependencies = [ "anyhow", - "wasmparser", + "wasmparser 0.118.1", ] [[package]] diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml index 84ee9238ab..90fee8999f 100644 --- a/data/codec-derive/Cargo.toml +++ b/data/codec-derive/Cargo.toml @@ -21,7 +21,7 @@ proc-macro = true default = ["syn/full", "syn/parsing", "syn/extra-traits"] [dependencies] -proc-macro2 = "=1.0.76" +proc-macro2 = "=1.0.78" quote = "=1.0.35" syn = "=2.0.48" hex = "=0.4.3" diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml index 5e92e47c19..f2d0f4b532 100644 --- a/framework/base/Cargo.toml +++ b/framework/base/Cargo.toml @@ -23,7 +23,7 @@ esdt-token-payment-legacy-decode = [] [dependencies] hex-literal = "=0.4.1" -bitflags = "=2.4.1" +bitflags = "=2.4.2" num-traits = { version = "=0.2.17", default-features = false } [dependencies.multiversx-sc-derive] diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml index a59eea7aae..c91d9bcfa4 100644 --- a/framework/derive/Cargo.toml +++ b/framework/derive/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["multiversx", "blockchain", "contract"] categories = ["cryptography::cryptocurrencies", "development-tools::procedural-macro-helpers"] [dependencies] -proc-macro2 = "=1.0.76" +proc-macro2 = "=1.0.78" quote = "=1.0.35" syn = "=2.0.48" hex = "=0.4.3" diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml index 89d14dfa6b..c6774071fe 100644 --- a/framework/meta/Cargo.toml +++ b/framework/meta/Cargo.toml @@ -40,7 +40,7 @@ colored = "2.0" lazy_static = "1.4.0" convert_case = "0.6.0" hex = "0.4" -wasmparser = "0.118.1" +wasmparser = "0.120.0" wasmprinter = "0.2.71" semver = "1.0.20" diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml index c51967e720..b21536a82d 100644 --- a/framework/snippets/Cargo.toml +++ b/framework/snippets/Cargo.toml @@ -18,7 +18,7 @@ tokio = { version = "1.24", features = ["full"] } hex = "0.4" base64 = "0.21.5" log = "0.4.17" -env_logger = "0.10" +env_logger = "0.11" futures = "0.3" [dependencies.multiversx-sc-scenario] diff --git a/vm/Cargo.toml b/vm/Cargo.toml index afc0da0086..23673a8591 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -27,7 +27,7 @@ rand_seeder = "0.2.2" ed25519-dalek = "2.0.0" itertools = "0.12.0" hex-literal = "=0.4.1" -bitflags = "=2.4.1" +bitflags = "=2.4.2" [dependencies.multiversx-chain-vm-executor] version = "0.2.0" From 4ff6aaf56faac2d16e56a5ed24d664cf9846ca22 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 29 Jan 2024 14:12:30 +0200 Subject: [PATCH 83/84] sc 0.47.1, codec 0.18.5, vm 0.8.1, scenario-format 0.22.1 --- CHANGELOG.md | 5 ++++ Cargo.lock | 26 +++++++++---------- contracts/benchmarks/large-storage/Cargo.toml | 4 +-- .../benchmarks/large-storage/meta/Cargo.toml | 2 +- .../benchmarks/large-storage/wasm/Cargo.toml | 2 +- .../mappers/benchmark-common/Cargo.toml | 4 +-- .../mappers/linked-list-repeat/Cargo.toml | 4 +-- .../linked-list-repeat/meta/Cargo.toml | 2 +- .../linked-list-repeat/wasm/Cargo.toml | 2 +- .../benchmarks/mappers/map-repeat/Cargo.toml | 4 +-- .../mappers/map-repeat/meta/Cargo.toml | 2 +- .../mappers/map-repeat/wasm/Cargo.toml | 2 +- .../mappers/queue-repeat/Cargo.toml | 4 +-- .../mappers/queue-repeat/meta/Cargo.toml | 2 +- .../mappers/queue-repeat/wasm/Cargo.toml | 2 +- .../benchmarks/mappers/set-repeat/Cargo.toml | 4 +-- .../mappers/set-repeat/meta/Cargo.toml | 2 +- .../mappers/set-repeat/wasm/Cargo.toml | 2 +- .../mappers/single-value-repeat/Cargo.toml | 4 +-- .../single-value-repeat/meta/Cargo.toml | 2 +- .../single-value-repeat/wasm/Cargo.toml | 2 +- .../benchmarks/mappers/vec-repeat/Cargo.toml | 4 +-- .../mappers/vec-repeat/meta/Cargo.toml | 2 +- .../mappers/vec-repeat/wasm/Cargo.toml | 2 +- .../benchmarks/send-tx-repeat/Cargo.toml | 4 +-- .../benchmarks/send-tx-repeat/meta/Cargo.toml | 2 +- .../benchmarks/send-tx-repeat/wasm/Cargo.toml | 2 +- contracts/benchmarks/str-repeat/Cargo.toml | 4 +-- .../benchmarks/str-repeat/meta/Cargo.toml | 2 +- .../benchmarks/str-repeat/wasm/Cargo.toml | 2 +- contracts/core/price-aggregator/Cargo.toml | 8 +++--- .../core/price-aggregator/meta/Cargo.toml | 4 +-- .../core/price-aggregator/wasm/Cargo.toml | 2 +- contracts/core/wegld-swap/Cargo.toml | 8 +++--- contracts/core/wegld-swap/meta/Cargo.toml | 4 +-- contracts/core/wegld-swap/wasm/Cargo.toml | 2 +- contracts/examples/adder/Cargo.toml | 4 +-- contracts/examples/adder/interact/Cargo.toml | 2 +- contracts/examples/adder/meta/Cargo.toml | 2 +- contracts/examples/adder/wasm/Cargo.toml | 2 +- .../bonding-curve-contract/Cargo.toml | 6 ++--- .../bonding-curve-contract/meta/Cargo.toml | 2 +- .../bonding-curve-contract/wasm/Cargo.toml | 2 +- contracts/examples/check-pause/Cargo.toml | 6 ++--- .../examples/check-pause/meta/Cargo.toml | 2 +- .../examples/check-pause/wasm/Cargo.toml | 2 +- .../examples/crowdfunding-esdt/Cargo.toml | 4 +-- .../crowdfunding-esdt/meta/Cargo.toml | 2 +- .../crowdfunding-esdt/wasm/Cargo.toml | 2 +- contracts/examples/crypto-bubbles/Cargo.toml | 4 +-- .../examples/crypto-bubbles/meta/Cargo.toml | 2 +- .../examples/crypto-bubbles/wasm/Cargo.toml | 2 +- .../crypto-kitties/common/kitty/Cargo.toml | 2 +- .../crypto-kitties/common/random/Cargo.toml | 2 +- .../crypto-kitties/kitty-auction/Cargo.toml | 4 +-- .../kitty-auction/meta/Cargo.toml | 2 +- .../kitty-auction/wasm/Cargo.toml | 2 +- .../kitty-genetic-alg/Cargo.toml | 4 +-- .../kitty-genetic-alg/meta/Cargo.toml | 2 +- .../kitty-genetic-alg/wasm/Cargo.toml | 2 +- .../crypto-kitties/kitty-ownership/Cargo.toml | 4 +-- .../kitty-ownership/meta/Cargo.toml | 2 +- .../kitty-ownership/wasm/Cargo.toml | 2 +- contracts/examples/crypto-zombies/Cargo.toml | 4 +-- .../examples/crypto-zombies/meta/Cargo.toml | 2 +- .../examples/crypto-zombies/wasm/Cargo.toml | 2 +- contracts/examples/digital-cash/Cargo.toml | 4 +-- .../examples/digital-cash/meta/Cargo.toml | 2 +- .../examples/digital-cash/wasm/Cargo.toml | 2 +- contracts/examples/empty/Cargo.toml | 4 +-- contracts/examples/empty/meta/Cargo.toml | 2 +- contracts/examples/empty/wasm/Cargo.toml | 2 +- .../esdt-transfer-with-fee/Cargo.toml | 4 +-- .../esdt-transfer-with-fee/meta/Cargo.toml | 2 +- .../esdt-transfer-with-fee/wasm/Cargo.toml | 2 +- contracts/examples/factorial/Cargo.toml | 4 +-- contracts/examples/factorial/meta/Cargo.toml | 2 +- contracts/examples/factorial/wasm/Cargo.toml | 2 +- contracts/examples/fractional-nfts/Cargo.toml | 6 ++--- .../examples/fractional-nfts/meta/Cargo.toml | 2 +- .../examples/fractional-nfts/wasm/Cargo.toml | 2 +- contracts/examples/lottery-esdt/Cargo.toml | 4 +-- .../examples/lottery-esdt/meta/Cargo.toml | 2 +- .../examples/lottery-esdt/wasm/Cargo.toml | 2 +- contracts/examples/multisig/Cargo.toml | 8 +++--- .../examples/multisig/interact/Cargo.toml | 6 ++--- contracts/examples/multisig/meta/Cargo.toml | 2 +- .../multisig/test-contracts/adder.mxsc.json | 2 +- .../test-contracts/factorial.mxsc.json | 2 +- .../multisig/wasm-multisig-full/Cargo.toml | 2 +- .../multisig/wasm-multisig-view/Cargo.toml | 2 +- contracts/examples/multisig/wasm/Cargo.toml | 2 +- contracts/examples/nft-minter/Cargo.toml | 4 +-- contracts/examples/nft-minter/meta/Cargo.toml | 2 +- contracts/examples/nft-minter/wasm/Cargo.toml | 2 +- .../examples/nft-storage-prepay/Cargo.toml | 4 +-- .../nft-storage-prepay/meta/Cargo.toml | 2 +- .../nft-storage-prepay/wasm/Cargo.toml | 2 +- .../examples/nft-subscription/Cargo.toml | 6 ++--- .../examples/nft-subscription/meta/Cargo.toml | 2 +- .../examples/nft-subscription/wasm/Cargo.toml | 2 +- .../examples/order-book/factory/Cargo.toml | 4 +-- .../order-book/factory/meta/Cargo.toml | 2 +- .../order-book/factory/wasm/Cargo.toml | 2 +- contracts/examples/order-book/pair/Cargo.toml | 4 +-- .../examples/order-book/pair/meta/Cargo.toml | 2 +- .../examples/order-book/pair/wasm/Cargo.toml | 2 +- contracts/examples/ping-pong-egld/Cargo.toml | 4 +-- .../examples/ping-pong-egld/meta/Cargo.toml | 2 +- .../examples/ping-pong-egld/wasm/Cargo.toml | 2 +- contracts/examples/proxy-pause/Cargo.toml | 4 +-- .../examples/proxy-pause/meta/Cargo.toml | 2 +- .../examples/proxy-pause/wasm/Cargo.toml | 2 +- .../examples/rewards-distribution/Cargo.toml | 6 ++--- .../rewards-distribution/meta/Cargo.toml | 2 +- .../rewards-distribution/wasm/Cargo.toml | 2 +- contracts/examples/seed-nft-minter/Cargo.toml | 6 ++--- .../examples/seed-nft-minter/meta/Cargo.toml | 2 +- .../examples/seed-nft-minter/wasm/Cargo.toml | 2 +- contracts/examples/token-release/Cargo.toml | 4 +-- .../examples/token-release/meta/Cargo.toml | 2 +- .../examples/token-release/wasm/Cargo.toml | 2 +- contracts/feature-tests/abi-tester/Cargo.toml | 6 ++--- .../abi_tester_expected_main.abi.json | 2 +- .../abi_tester_expected_view.abi.json | 2 +- .../feature-tests/abi-tester/meta/Cargo.toml | 2 +- .../abi-tester/wasm-abi-tester-ev/Cargo.toml | 2 +- .../feature-tests/abi-tester/wasm/Cargo.toml | 2 +- .../feature-tests/alloc-features/Cargo.toml | 4 +-- .../alloc-features/meta/Cargo.toml | 2 +- .../alloc-features/wasm/Cargo.toml | 2 +- .../feature-tests/basic-features/Cargo.toml | 6 ++--- .../basic-features/interact/Cargo.toml | 2 +- .../basic-features/meta/Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../basic-features/wasm/Cargo.toml | 2 +- .../big-float-features/Cargo.toml | 4 +-- .../big-float-features/meta/Cargo.toml | 2 +- .../big-float-features/wasm/Cargo.toml | 2 +- .../feature-tests/composability/Cargo.toml | 4 +-- .../builtin-func-features/Cargo.toml | 4 +-- .../builtin-func-features/meta/Cargo.toml | 2 +- .../builtin-func-features/wasm/Cargo.toml | 2 +- .../esdt-contract-pair/Cargo.toml | 4 +-- .../first-contract/Cargo.toml | 4 +-- .../first-contract/meta/Cargo.toml | 4 +-- .../first-contract/wasm/Cargo.toml | 2 +- .../second-contract/Cargo.toml | 4 +-- .../second-contract/meta/Cargo.toml | 4 +-- .../second-contract/wasm/Cargo.toml | 2 +- .../Cargo.toml | 4 +-- .../child/Cargo.toml | 4 +-- .../child/meta/Cargo.toml | 4 +-- .../child/wasm/Cargo.toml | 2 +- .../parent/Cargo.toml | 4 +-- .../parent/meta/Cargo.toml | 4 +-- .../parent/wasm/Cargo.toml | 2 +- .../composability/forwarder-queue/Cargo.toml | 6 ++--- .../forwarder-queue/meta/Cargo.toml | 2 +- .../wasm-forwarder-queue-promises/Cargo.toml | 2 +- .../forwarder-queue/wasm/Cargo.toml | 2 +- .../composability/forwarder-raw/Cargo.toml | 4 +-- .../forwarder-raw/meta/Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../forwarder-raw/wasm/Cargo.toml | 2 +- .../composability/forwarder/Cargo.toml | 4 +-- .../composability/forwarder/meta/Cargo.toml | 2 +- .../composability/forwarder/wasm/Cargo.toml | 2 +- .../composability/interact/Cargo.toml | 4 +-- .../local-esdt-and-nft/Cargo.toml | 4 +-- .../local-esdt-and-nft/meta/Cargo.toml | 2 +- .../local-esdt-and-nft/wasm/Cargo.toml | 2 +- .../promises-features/Cargo.toml | 2 +- .../promises-features/meta/Cargo.toml | 2 +- .../promises-features/wasm/Cargo.toml | 2 +- .../composability/proxy-test-first/Cargo.toml | 4 +-- .../proxy-test-first/meta/Cargo.toml | 2 +- .../proxy-test-first/wasm/Cargo.toml | 2 +- .../proxy-test-second/Cargo.toml | 4 +-- .../proxy-test-second/meta/Cargo.toml | 2 +- .../proxy-test-second/wasm/Cargo.toml | 2 +- .../composability/recursive-caller/Cargo.toml | 4 +-- .../recursive-caller/meta/Cargo.toml | 2 +- .../recursive-caller/wasm/Cargo.toml | 2 +- .../transfer-role-features/Cargo.toml | 6 ++--- .../transfer-role-features/meta/Cargo.toml | 2 +- .../transfer-role-features/wasm/Cargo.toml | 2 +- .../composability/vault/Cargo.toml | 4 +-- .../composability/vault/meta/Cargo.toml | 2 +- .../vault/wasm-vault-promises/Cargo.toml | 2 +- .../vault/wasm-vault-upgrade/Cargo.toml | 2 +- .../composability/vault/wasm/Cargo.toml | 2 +- .../crowdfunding-erc20/Cargo.toml | 4 +-- .../crowdfunding-erc20/meta/Cargo.toml | 2 +- .../crowdfunding-erc20/wasm/Cargo.toml | 2 +- .../erc1155-marketplace/Cargo.toml | 4 +-- .../erc1155-marketplace/meta/Cargo.toml | 2 +- .../erc1155-marketplace/wasm/Cargo.toml | 2 +- .../erc1155-user-mock/Cargo.toml | 4 +-- .../erc1155-user-mock/meta/Cargo.toml | 2 +- .../erc1155-user-mock/wasm/Cargo.toml | 2 +- .../erc-style-contracts/erc1155/Cargo.toml | 4 +-- .../erc1155/meta/Cargo.toml | 2 +- .../erc1155/wasm/Cargo.toml | 2 +- .../erc-style-contracts/erc20/Cargo.toml | 4 +-- .../erc-style-contracts/erc20/meta/Cargo.toml | 2 +- .../erc-style-contracts/erc20/wasm/Cargo.toml | 2 +- .../erc-style-contracts/erc721/Cargo.toml | 4 +-- .../erc721/meta/Cargo.toml | 2 +- .../erc721/wasm/Cargo.toml | 2 +- .../lottery-erc20/Cargo.toml | 4 +-- .../lottery-erc20/meta/Cargo.toml | 2 +- .../lottery-erc20/wasm/Cargo.toml | 2 +- .../esdt-system-sc-mock/Cargo.toml | 4 +-- .../esdt-system-sc-mock/meta/Cargo.toml | 2 +- .../esdt-system-sc-mock/wasm/Cargo.toml | 2 +- .../formatted-message-features/Cargo.toml | 4 +-- .../meta/Cargo.toml | 2 +- .../wasm/Cargo.toml | 2 +- .../managed-map-features/Cargo.toml | 4 +-- .../managed-map-features/meta/Cargo.toml | 2 +- .../managed-map-features/wasm/Cargo.toml | 2 +- .../multi-contract-features/Cargo.toml | 4 +-- .../multi-contract-features/meta/Cargo.toml | 2 +- .../wasm-multi-contract-alt-impl/Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../multi-contract-features/wasm/Cargo.toml | 2 +- .../panic-message-features/Cargo.toml | 4 +-- .../panic-message-features/meta/Cargo.toml | 2 +- .../panic-message-features/wasm/Cargo.toml | 2 +- .../feature-tests/payable-features/Cargo.toml | 4 +-- .../payable-features/meta/Cargo.toml | 2 +- .../payable-features/wasm/Cargo.toml | 2 +- .../rust-snippets-generator-test/Cargo.toml | 4 +-- .../interact-rs/Cargo.toml | 2 +- .../meta/Cargo.toml | 2 +- .../rust-snippets-generator-test/src/lib.rs | 2 +- .../wasm/Cargo.toml | 2 +- .../rust-testing-framework-tester/Cargo.toml | 4 +-- .../meta/Cargo.toml | 2 +- .../wasm/Cargo.toml | 2 +- contracts/feature-tests/use-module/Cargo.toml | 8 +++--- .../feature-tests/use-module/meta/Cargo.toml | 2 +- .../use-module/meta/abi/Cargo.toml | 4 +-- .../use_module_expected_main.abi.json | 2 +- .../use_module_expected_view.abi.json | 2 +- .../wasm-use-module-view/Cargo.toml | 2 +- .../feature-tests/use-module/wasm/Cargo.toml | 2 +- contracts/modules/Cargo.toml | 4 +-- data/codec-derive/Cargo.toml | 2 +- data/codec/Cargo.toml | 6 ++--- framework/base/Cargo.toml | 6 ++--- framework/derive/Cargo.toml | 2 +- framework/meta/Cargo.toml | 4 +-- .../generate_snippets/snippet_crate_gen.rs | 2 +- .../meta/src/cmd/contract/meta_config.rs | 4 +-- framework/meta/src/version_history.rs | 5 ++-- framework/scenario/Cargo.toml | 10 +++---- framework/snippets/Cargo.toml | 4 +-- framework/wasm-adapter/Cargo.toml | 4 +-- sdk/scenario-format/Cargo.toml | 2 +- tools/mxpy-snippet-generator/Cargo.toml | 2 +- tools/rust-debugger/format-tests/Cargo.toml | 6 ++--- vm/Cargo.toml | 2 +- 266 files changed, 402 insertions(+), 396 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc55f09086..ef5e27e856 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,11 @@ They are: - `multiversx-chain-scenario-format`, in short `scenario-format`, scenario JSON serializer/deserializer, 1 crate. - `multiversx-sdk`, in short `sdk`, allows communication with the chain(s), 1 crate. +## [sc 0.47.1, codec 0.18.5, vm 0.8.1, scenario-format 0.22.1] - 2024-01-29 +- Blockchain hooks: `get_code_metadata`, `is_builtin_function`. +- Support for `mxsc:` syntax in scenarios. +- Updated dependencies. + ## [sc 0.47.0, codec 0.18.4, vm 0.8.0, scenario-format 0.22.0] - 2024-01-23 - Added support for the code metadata in the Rust VM and Rust scenarios backend. - `sc-meta`: diff --git a/Cargo.lock b/Cargo.lock index 5b52e8dfc2..aa857f5105 100755 --- a/Cargo.lock +++ b/Cargo.lock @@ -1768,7 +1768,7 @@ dependencies = [ [[package]] name = "multiversx-chain-scenario-format" -version = "0.22.0" +version = "0.22.1" dependencies = [ "bech32", "hex", @@ -1781,7 +1781,7 @@ dependencies = [ [[package]] name = "multiversx-chain-vm" -version = "0.8.0" +version = "0.8.1" dependencies = [ "bitflags 2.4.2", "ed25519-dalek", @@ -1805,7 +1805,7 @@ checksum = "b59072fa0624b55ae5ae3fa6bfa91515bbeb4ac440214bc4a509e2c8806d6e9f" [[package]] name = "multiversx-price-aggregator-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "arrayvec", "getrandom", @@ -1826,7 +1826,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags 2.4.2", "hex-literal", @@ -1837,7 +1837,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -1846,7 +1846,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -1856,7 +1856,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -1867,7 +1867,7 @@ dependencies = [ [[package]] name = "multiversx-sc-meta" -version = "0.47.0" +version = "0.47.1" dependencies = [ "clap", "colored", @@ -1893,14 +1893,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-scenario" -version = "0.47.0" +version = "0.47.1" dependencies = [ "base64", "bech32", @@ -1926,7 +1926,7 @@ dependencies = [ [[package]] name = "multiversx-sc-snippets" -version = "0.47.0" +version = "0.47.1" dependencies = [ "base64", "env_logger", @@ -1940,7 +1940,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -1971,7 +1971,7 @@ dependencies = [ [[package]] name = "multiversx-wegld-swap-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", "multiversx-sc-modules", diff --git a/contracts/benchmarks/large-storage/Cargo.toml b/contracts/benchmarks/large-storage/Cargo.toml index 4eb422079e..dcc2b99c46 100644 --- a/contracts/benchmarks/large-storage/Cargo.toml +++ b/contracts/benchmarks/large-storage/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/large_storage.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/benchmarks/large-storage/meta/Cargo.toml b/contracts/benchmarks/large-storage/meta/Cargo.toml index 212070f5fb..fb280c1436 100644 --- a/contracts/benchmarks/large-storage/meta/Cargo.toml +++ b/contracts/benchmarks/large-storage/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.toml b/contracts/benchmarks/large-storage/wasm/Cargo.toml index b8517c59c7..e4fe6ef421 100644 --- a/contracts/benchmarks/large-storage/wasm/Cargo.toml +++ b/contracts/benchmarks/large-storage/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml index f71573b94a..2d826d0401 100644 --- a/contracts/benchmarks/mappers/benchmark-common/Cargo.toml +++ b/contracts/benchmarks/mappers/benchmark-common/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml index 91e0b8cedd..0580096a7a 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/linked-list-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml index 855accebf6..2e1780052e 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/linked-list-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml index fb5e9fcba1..6e13eb452c 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/map-repeat/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/Cargo.toml index 354a616359..abb009e915 100644 --- a/contracts/benchmarks/mappers/map-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/map-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml index 751fbbd6e3..309a30f7dc 100644 --- a/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/map-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml index 248cbcb80f..c263c199cf 100644 --- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml index 6741b087e5..eb5be92b63 100644 --- a/contracts/benchmarks/mappers/queue-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/queue-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml index 366fdc07c8..ac43f6aaad 100644 --- a/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/queue-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml index 184d4cf172..1eff603231 100644 --- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/set-repeat/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/Cargo.toml index e5b5d067e1..27be5f3f04 100644 --- a/contracts/benchmarks/mappers/set-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/set-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml index b386b7da9b..d6faaf64ee 100644 --- a/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/set-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml index 0596bc371f..05ba0ef635 100644 --- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml index fedf9e5ac0..545d820868 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/single-value-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml index 67adcf3296..f6e07ca08b 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/single-value-repeat/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml index 900facc16c..fc2c731517 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml index 34cefe4970..1e83d4b57f 100644 --- a/contracts/benchmarks/mappers/vec-repeat/Cargo.toml +++ b/contracts/benchmarks/mappers/vec-repeat/Cargo.toml @@ -13,9 +13,9 @@ path = "../benchmark-common" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml index 45672d0c85..9dd9e7997b 100644 --- a/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/mappers/vec-repeat/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml index aaf28c7ccd..aac858ec65 100644 --- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/send-tx-repeat/Cargo.toml b/contracts/benchmarks/send-tx-repeat/Cargo.toml index 05688e2b0a..977428ca63 100644 --- a/contracts/benchmarks/send-tx-repeat/Cargo.toml +++ b/contracts/benchmarks/send-tx-repeat/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/send_tx_repeat.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml index 18c89c9b18..176b5a3f74 100644 --- a/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/send-tx-repeat/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml index 2870403402..7196dbedaa 100644 --- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/benchmarks/str-repeat/Cargo.toml b/contracts/benchmarks/str-repeat/Cargo.toml index fd64d75686..a2a9ca0aca 100644 --- a/contracts/benchmarks/str-repeat/Cargo.toml +++ b/contracts/benchmarks/str-repeat/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/str_repeat.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/benchmarks/str-repeat/meta/Cargo.toml b/contracts/benchmarks/str-repeat/meta/Cargo.toml index 4de99cf57b..b89106f227 100644 --- a/contracts/benchmarks/str-repeat/meta/Cargo.toml +++ b/contracts/benchmarks/str-repeat/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.toml b/contracts/benchmarks/str-repeat/wasm/Cargo.toml index 7366900e9f..2305e9ff72 100644 --- a/contracts/benchmarks/str-repeat/wasm/Cargo.toml +++ b/contracts/benchmarks/str-repeat/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/core/price-aggregator/Cargo.toml b/contracts/core/price-aggregator/Cargo.toml index 0c8baadd9c..c4ab3d995d 100644 --- a/contracts/core/price-aggregator/Cargo.toml +++ b/contracts/core/price-aggregator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-price-aggregator-sc" -version = "0.47.0" +version = "0.47.1" authors = [ "Claudiu-Marcel Bruda ", "MultiversX ", @@ -19,15 +19,15 @@ edition = "2021" path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dependencies] diff --git a/contracts/core/price-aggregator/meta/Cargo.toml b/contracts/core/price-aggregator/meta/Cargo.toml index 0b56f9652c..a04867e9c6 100644 --- a/contracts/core/price-aggregator/meta/Cargo.toml +++ b/contracts/core/price-aggregator/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/core/price-aggregator/wasm/Cargo.toml b/contracts/core/price-aggregator/wasm/Cargo.toml index a8ee7b4c89..5181448483 100644 --- a/contracts/core/price-aggregator/wasm/Cargo.toml +++ b/contracts/core/price-aggregator/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/core/wegld-swap/Cargo.toml b/contracts/core/wegld-swap/Cargo.toml index 997ec92580..18b2dbb46b 100644 --- a/contracts/core/wegld-swap/Cargo.toml +++ b/contracts/core/wegld-swap/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-wegld-swap-sc" -version = "0.47.0" +version = "0.47.1" authors = [ "Dorin Iancu ", @@ -20,13 +20,13 @@ edition = "2021" path = "src/wegld.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/core/wegld-swap/meta/Cargo.toml b/contracts/core/wegld-swap/meta/Cargo.toml index f04026c742..c0b4076004 100644 --- a/contracts/core/wegld-swap/meta/Cargo.toml +++ b/contracts/core/wegld-swap/meta/Cargo.toml @@ -11,10 +11,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/core/wegld-swap/wasm/Cargo.toml b/contracts/core/wegld-swap/wasm/Cargo.toml index d5d6c93252..d2523b2e41 100644 --- a/contracts/core/wegld-swap/wasm/Cargo.toml +++ b/contracts/core/wegld-swap/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/adder/Cargo.toml b/contracts/examples/adder/Cargo.toml index 10ac753532..3453f909c3 100644 --- a/contracts/examples/adder/Cargo.toml +++ b/contracts/examples/adder/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/adder.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/adder/interact/Cargo.toml b/contracts/examples/adder/interact/Cargo.toml index 382a47700f..052466fb49 100644 --- a/contracts/examples/adder/interact/Cargo.toml +++ b/contracts/examples/adder/interact/Cargo.toml @@ -18,5 +18,5 @@ toml = "0.8.6" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/snippets" diff --git a/contracts/examples/adder/meta/Cargo.toml b/contracts/examples/adder/meta/Cargo.toml index 1ceef37f98..e5afa09028 100644 --- a/contracts/examples/adder/meta/Cargo.toml +++ b/contracts/examples/adder/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/adder/wasm/Cargo.toml b/contracts/examples/adder/wasm/Cargo.toml index 90450ca2fe..bc17f7dfd9 100644 --- a/contracts/examples/adder/wasm/Cargo.toml +++ b/contracts/examples/adder/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/bonding-curve-contract/Cargo.toml b/contracts/examples/bonding-curve-contract/Cargo.toml index 54128edd77..a8faa2a881 100644 --- a/contracts/examples/bonding-curve-contract/Cargo.toml +++ b/contracts/examples/bonding-curve-contract/Cargo.toml @@ -9,14 +9,14 @@ publish = false path = "src/bonding_curve_contract.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/bonding-curve-contract/meta/Cargo.toml b/contracts/examples/bonding-curve-contract/meta/Cargo.toml index dc40de2cc4..e8e9baf42c 100644 --- a/contracts/examples/bonding-curve-contract/meta/Cargo.toml +++ b/contracts/examples/bonding-curve-contract/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml index e1513dd0e3..4d44db4b9b 100644 --- a/contracts/examples/bonding-curve-contract/wasm/Cargo.toml +++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/check-pause/Cargo.toml b/contracts/examples/check-pause/Cargo.toml index a2b509d789..50e8387c37 100644 --- a/contracts/examples/check-pause/Cargo.toml +++ b/contracts/examples/check-pause/Cargo.toml @@ -12,14 +12,14 @@ path = "src/check_pause.rs" num-bigint = "0.4" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/check-pause/meta/Cargo.toml b/contracts/examples/check-pause/meta/Cargo.toml index 377b49534a..866646fb08 100644 --- a/contracts/examples/check-pause/meta/Cargo.toml +++ b/contracts/examples/check-pause/meta/Cargo.toml @@ -9,6 +9,6 @@ authors = ["Alin Cruceat "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/check-pause/wasm/Cargo.toml b/contracts/examples/check-pause/wasm/Cargo.toml index b4e6752123..9855084f0d 100644 --- a/contracts/examples/check-pause/wasm/Cargo.toml +++ b/contracts/examples/check-pause/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crowdfunding-esdt/Cargo.toml b/contracts/examples/crowdfunding-esdt/Cargo.toml index 26dac5a965..cb376a1743 100644 --- a/contracts/examples/crowdfunding-esdt/Cargo.toml +++ b/contracts/examples/crowdfunding-esdt/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/crowdfunding_esdt.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dev-dependencies] diff --git a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml index fd153f9488..e5dab04398 100644 --- a/contracts/examples/crowdfunding-esdt/meta/Cargo.toml +++ b/contracts/examples/crowdfunding-esdt/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml index 866f535305..a2e3b7d9cc 100644 --- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml +++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-bubbles/Cargo.toml b/contracts/examples/crypto-bubbles/Cargo.toml index 31c0b5dec2..20d48fe501 100644 --- a/contracts/examples/crypto-bubbles/Cargo.toml +++ b/contracts/examples/crypto-bubbles/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/crypto_bubbles.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/crypto-bubbles/meta/Cargo.toml b/contracts/examples/crypto-bubbles/meta/Cargo.toml index 2c47928aa5..9c7003e8ea 100644 --- a/contracts/examples/crypto-bubbles/meta/Cargo.toml +++ b/contracts/examples/crypto-bubbles/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.toml b/contracts/examples/crypto-bubbles/wasm/Cargo.toml index cafdfc3dae..7a3483d93e 100644 --- a/contracts/examples/crypto-bubbles/wasm/Cargo.toml +++ b/contracts/examples/crypto-bubbles/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-kitties/common/kitty/Cargo.toml b/contracts/examples/crypto-kitties/common/kitty/Cargo.toml index 18ae686d28..bb4ec07418 100644 --- a/contracts/examples/crypto-kitties/common/kitty/Cargo.toml +++ b/contracts/examples/crypto-kitties/common/kitty/Cargo.toml @@ -9,7 +9,7 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/base" [dependencies.random] diff --git a/contracts/examples/crypto-kitties/common/random/Cargo.toml b/contracts/examples/crypto-kitties/common/random/Cargo.toml index 0bb169dea4..16e916b399 100644 --- a/contracts/examples/crypto-kitties/common/random/Cargo.toml +++ b/contracts/examples/crypto-kitties/common/random/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/base" diff --git a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml index e8a40b1c87..8bc113a7bb 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-auction/Cargo.toml @@ -17,9 +17,9 @@ version = "0.0.0" path = "../kitty-ownership" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml index 4d3dbaedf7..d74d3e6b7a 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-auction/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml index 2497ff3db8..7fac9843c5 100644 --- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml index c33e950ff8..591e93123e 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/Cargo.toml @@ -18,9 +18,9 @@ version = "0.0.0" path = "../common/random" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml index 3043e6412b..013fd1aa08 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml index d1875bd6e7..fe6f5c2581 100644 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml index 6190193ffa..821fe10561 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-ownership/Cargo.toml @@ -21,9 +21,9 @@ version = "0.0.0" path = "../kitty-genetic-alg" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml index 8e5b96c38f..309c539e80 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-ownership/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml index 589d3dd1cd..25432641ec 100644 --- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml +++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/crypto-zombies/Cargo.toml b/contracts/examples/crypto-zombies/Cargo.toml index 5d60b29d79..43a35eecf1 100644 --- a/contracts/examples/crypto-zombies/Cargo.toml +++ b/contracts/examples/crypto-zombies/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/crypto-zombies/meta/Cargo.toml b/contracts/examples/crypto-zombies/meta/Cargo.toml index dfb35656b5..ddd117f91d 100644 --- a/contracts/examples/crypto-zombies/meta/Cargo.toml +++ b/contracts/examples/crypto-zombies/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.toml b/contracts/examples/crypto-zombies/wasm/Cargo.toml index a373510e98..6ebdb049be 100644 --- a/contracts/examples/crypto-zombies/wasm/Cargo.toml +++ b/contracts/examples/crypto-zombies/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/digital-cash/Cargo.toml b/contracts/examples/digital-cash/Cargo.toml index 283d4dda3d..bf896193d3 100644 --- a/contracts/examples/digital-cash/Cargo.toml +++ b/contracts/examples/digital-cash/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/digital_cash.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/digital-cash/meta/Cargo.toml b/contracts/examples/digital-cash/meta/Cargo.toml index bdcf495260..527cd0a2d7 100644 --- a/contracts/examples/digital-cash/meta/Cargo.toml +++ b/contracts/examples/digital-cash/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/digital-cash/wasm/Cargo.toml b/contracts/examples/digital-cash/wasm/Cargo.toml index adc9a33145..1284590460 100644 --- a/contracts/examples/digital-cash/wasm/Cargo.toml +++ b/contracts/examples/digital-cash/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/empty/Cargo.toml b/contracts/examples/empty/Cargo.toml index 45a4d65752..f44ef249be 100644 --- a/contracts/examples/empty/Cargo.toml +++ b/contracts/examples/empty/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/empty.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dev-dependencies] diff --git a/contracts/examples/empty/meta/Cargo.toml b/contracts/examples/empty/meta/Cargo.toml index 8bdcec3371..49477a946b 100644 --- a/contracts/examples/empty/meta/Cargo.toml +++ b/contracts/examples/empty/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/empty/wasm/Cargo.toml b/contracts/examples/empty/wasm/Cargo.toml index 90e97296a9..91173bb778 100644 --- a/contracts/examples/empty/wasm/Cargo.toml +++ b/contracts/examples/empty/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/esdt-transfer-with-fee/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/Cargo.toml index 561f281195..bd2df5a7c4 100644 --- a/contracts/examples/esdt-transfer-with-fee/Cargo.toml +++ b/contracts/examples/esdt-transfer-with-fee/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/esdt_transfer_with_fee.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml index 0533600a58..31ac3774e6 100644 --- a/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml +++ b/contracts/examples/esdt-transfer-with-fee/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml index 1ec62546f0..c3ea31e4bb 100644 --- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml +++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/factorial/Cargo.toml b/contracts/examples/factorial/Cargo.toml index 4f638efb95..b70f5ab41c 100644 --- a/contracts/examples/factorial/Cargo.toml +++ b/contracts/examples/factorial/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/factorial.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/factorial/meta/Cargo.toml b/contracts/examples/factorial/meta/Cargo.toml index ee8ecd5819..ce5e1352ae 100644 --- a/contracts/examples/factorial/meta/Cargo.toml +++ b/contracts/examples/factorial/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/factorial/wasm/Cargo.toml b/contracts/examples/factorial/wasm/Cargo.toml index adb6375804..2027996e93 100644 --- a/contracts/examples/factorial/wasm/Cargo.toml +++ b/contracts/examples/factorial/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/fractional-nfts/Cargo.toml b/contracts/examples/fractional-nfts/Cargo.toml index 19235c4369..eff1cf0b15 100644 --- a/contracts/examples/fractional-nfts/Cargo.toml +++ b/contracts/examples/fractional-nfts/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/fractional_nfts.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/fractional-nfts/meta/Cargo.toml b/contracts/examples/fractional-nfts/meta/Cargo.toml index 0bedf88f4c..a6f26df7da 100644 --- a/contracts/examples/fractional-nfts/meta/Cargo.toml +++ b/contracts/examples/fractional-nfts/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.toml b/contracts/examples/fractional-nfts/wasm/Cargo.toml index 4cfe31f483..5f475377d7 100644 --- a/contracts/examples/fractional-nfts/wasm/Cargo.toml +++ b/contracts/examples/fractional-nfts/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/lottery-esdt/Cargo.toml b/contracts/examples/lottery-esdt/Cargo.toml index 229de9331e..6198d750d4 100644 --- a/contracts/examples/lottery-esdt/Cargo.toml +++ b/contracts/examples/lottery-esdt/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lottery.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/lottery-esdt/meta/Cargo.toml b/contracts/examples/lottery-esdt/meta/Cargo.toml index d36e112024..5eec36802f 100644 --- a/contracts/examples/lottery-esdt/meta/Cargo.toml +++ b/contracts/examples/lottery-esdt/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.toml b/contracts/examples/lottery-esdt/wasm/Cargo.toml index ece6134cec..3414255cd9 100644 --- a/contracts/examples/lottery-esdt/wasm/Cargo.toml +++ b/contracts/examples/lottery-esdt/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/multisig/Cargo.toml b/contracts/examples/multisig/Cargo.toml index a631aeb8be..6d67a0f922 100644 --- a/contracts/examples/multisig/Cargo.toml +++ b/contracts/examples/multisig/Cargo.toml @@ -9,15 +9,15 @@ publish = false path = "src/multisig.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dev-dependencies.adder] @@ -27,7 +27,7 @@ path = "../adder" path = "../factorial" [dev-dependencies.multiversx-wegld-swap-sc] -version = "0.47.0" +version = "0.47.1" path = "../../core/wegld-swap" [dev-dependencies] diff --git a/contracts/examples/multisig/interact/Cargo.toml b/contracts/examples/multisig/interact/Cargo.toml index 5d8c502351..4febd898ee 100644 --- a/contracts/examples/multisig/interact/Cargo.toml +++ b/contracts/examples/multisig/interact/Cargo.toml @@ -18,13 +18,13 @@ toml = "0.8.6" path = ".." [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../../contracts/modules" [dependencies.multiversx-sc-snippets] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/snippets" [dependencies.multiversx-sc-scenario] -version = "=0.47.0" +version = "=0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/examples/multisig/meta/Cargo.toml b/contracts/examples/multisig/meta/Cargo.toml index 253a8b946d..b538ab5cdf 100644 --- a/contracts/examples/multisig/meta/Cargo.toml +++ b/contracts/examples/multisig/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/multisig/test-contracts/adder.mxsc.json b/contracts/examples/multisig/test-contracts/adder.mxsc.json index 15527eb132..7211303a9c 100644 --- a/contracts/examples/multisig/test-contracts/adder.mxsc.json +++ b/contracts/examples/multisig/test-contracts/adder.mxsc.json @@ -13,7 +13,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.47.0" + "version": "0.47.1" } }, "abi": { diff --git a/contracts/examples/multisig/test-contracts/factorial.mxsc.json b/contracts/examples/multisig/test-contracts/factorial.mxsc.json index d6f4559d83..db27b09157 100644 --- a/contracts/examples/multisig/test-contracts/factorial.mxsc.json +++ b/contracts/examples/multisig/test-contracts/factorial.mxsc.json @@ -13,7 +13,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.47.0" + "version": "0.47.1" } }, "abi": { diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml index a51a5e375b..a02ca050d5 100644 --- a/contracts/examples/multisig/wasm-multisig-full/Cargo.toml +++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml index 0f80fbda5a..2fe5644122 100644 --- a/contracts/examples/multisig/wasm-multisig-view/Cargo.toml +++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/multisig/wasm/Cargo.toml b/contracts/examples/multisig/wasm/Cargo.toml index 06471ed0c9..df8063533d 100644 --- a/contracts/examples/multisig/wasm/Cargo.toml +++ b/contracts/examples/multisig/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/nft-minter/Cargo.toml b/contracts/examples/nft-minter/Cargo.toml index f1dbfa0382..5053f9b981 100644 --- a/contracts/examples/nft-minter/Cargo.toml +++ b/contracts/examples/nft-minter/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/nft-minter/meta/Cargo.toml b/contracts/examples/nft-minter/meta/Cargo.toml index 789c7bf944..903749a9a2 100644 --- a/contracts/examples/nft-minter/meta/Cargo.toml +++ b/contracts/examples/nft-minter/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/nft-minter/wasm/Cargo.toml b/contracts/examples/nft-minter/wasm/Cargo.toml index af5994790f..e17a49c3bf 100644 --- a/contracts/examples/nft-minter/wasm/Cargo.toml +++ b/contracts/examples/nft-minter/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/nft-storage-prepay/Cargo.toml b/contracts/examples/nft-storage-prepay/Cargo.toml index eca34af3fb..a51be91582 100644 --- a/contracts/examples/nft-storage-prepay/Cargo.toml +++ b/contracts/examples/nft-storage-prepay/Cargo.toml @@ -10,9 +10,9 @@ path = "src/nft_storage_prepay.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/nft-storage-prepay/meta/Cargo.toml b/contracts/examples/nft-storage-prepay/meta/Cargo.toml index a04ae2179e..981325cd64 100644 --- a/contracts/examples/nft-storage-prepay/meta/Cargo.toml +++ b/contracts/examples/nft-storage-prepay/meta/Cargo.toml @@ -11,6 +11,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml index 0bd8a131ae..afc95ae9ca 100644 --- a/contracts/examples/nft-storage-prepay/wasm/Cargo.toml +++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/nft-subscription/Cargo.toml b/contracts/examples/nft-subscription/Cargo.toml index 13da7207cc..a1a9e931c7 100644 --- a/contracts/examples/nft-subscription/Cargo.toml +++ b/contracts/examples/nft-subscription/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/nft-subscription/meta/Cargo.toml b/contracts/examples/nft-subscription/meta/Cargo.toml index dff391a7dd..71675f12c4 100644 --- a/contracts/examples/nft-subscription/meta/Cargo.toml +++ b/contracts/examples/nft-subscription/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/nft-subscription/wasm/Cargo.toml b/contracts/examples/nft-subscription/wasm/Cargo.toml index 1522cd97cb..de7aab241f 100644 --- a/contracts/examples/nft-subscription/wasm/Cargo.toml +++ b/contracts/examples/nft-subscription/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/order-book/factory/Cargo.toml b/contracts/examples/order-book/factory/Cargo.toml index a77308f2a9..9d1de4ddfe 100644 --- a/contracts/examples/order-book/factory/Cargo.toml +++ b/contracts/examples/order-book/factory/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/examples/order-book/factory/meta/Cargo.toml b/contracts/examples/order-book/factory/meta/Cargo.toml index 9d2e4c3409..96dfc3918f 100644 --- a/contracts/examples/order-book/factory/meta/Cargo.toml +++ b/contracts/examples/order-book/factory/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/examples/order-book/factory/wasm/Cargo.toml b/contracts/examples/order-book/factory/wasm/Cargo.toml index 4d5f9a1497..c07282d124 100644 --- a/contracts/examples/order-book/factory/wasm/Cargo.toml +++ b/contracts/examples/order-book/factory/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/order-book/pair/Cargo.toml b/contracts/examples/order-book/pair/Cargo.toml index 9aab909043..66caf024c6 100644 --- a/contracts/examples/order-book/pair/Cargo.toml +++ b/contracts/examples/order-book/pair/Cargo.toml @@ -8,9 +8,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/examples/order-book/pair/meta/Cargo.toml b/contracts/examples/order-book/pair/meta/Cargo.toml index 9e35bb8bb9..25f67e5b2b 100644 --- a/contracts/examples/order-book/pair/meta/Cargo.toml +++ b/contracts/examples/order-book/pair/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/examples/order-book/pair/wasm/Cargo.toml b/contracts/examples/order-book/pair/wasm/Cargo.toml index defbec9af5..491836ce6b 100644 --- a/contracts/examples/order-book/pair/wasm/Cargo.toml +++ b/contracts/examples/order-book/pair/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/ping-pong-egld/Cargo.toml b/contracts/examples/ping-pong-egld/Cargo.toml index 5d7c834856..5e095b9761 100644 --- a/contracts/examples/ping-pong-egld/Cargo.toml +++ b/contracts/examples/ping-pong-egld/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/ping_pong.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/ping-pong-egld/meta/Cargo.toml b/contracts/examples/ping-pong-egld/meta/Cargo.toml index 1b568fea0b..1ed1b9bddf 100644 --- a/contracts/examples/ping-pong-egld/meta/Cargo.toml +++ b/contracts/examples/ping-pong-egld/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.toml b/contracts/examples/ping-pong-egld/wasm/Cargo.toml index 80c1a8a803..f6ec748b6f 100644 --- a/contracts/examples/ping-pong-egld/wasm/Cargo.toml +++ b/contracts/examples/ping-pong-egld/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/proxy-pause/Cargo.toml b/contracts/examples/proxy-pause/Cargo.toml index 02e7cb0b03..f18ec51bdf 100644 --- a/contracts/examples/proxy-pause/Cargo.toml +++ b/contracts/examples/proxy-pause/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/proxy_pause.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dev-dependencies.check-pause] diff --git a/contracts/examples/proxy-pause/meta/Cargo.toml b/contracts/examples/proxy-pause/meta/Cargo.toml index 6eb3d10b26..2e6fa608e8 100644 --- a/contracts/examples/proxy-pause/meta/Cargo.toml +++ b/contracts/examples/proxy-pause/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = [ "you",] path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/proxy-pause/wasm/Cargo.toml b/contracts/examples/proxy-pause/wasm/Cargo.toml index 1d23782876..be039beed4 100644 --- a/contracts/examples/proxy-pause/wasm/Cargo.toml +++ b/contracts/examples/proxy-pause/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/rewards-distribution/Cargo.toml b/contracts/examples/rewards-distribution/Cargo.toml index f2fd448ff4..8e4152c212 100644 --- a/contracts/examples/rewards-distribution/Cargo.toml +++ b/contracts/examples/rewards-distribution/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/rewards_distribution.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/rewards-distribution/meta/Cargo.toml b/contracts/examples/rewards-distribution/meta/Cargo.toml index 898d9d56ef..397e895fcb 100644 --- a/contracts/examples/rewards-distribution/meta/Cargo.toml +++ b/contracts/examples/rewards-distribution/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = ["Claudiu-Marcel Bruda "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.toml b/contracts/examples/rewards-distribution/wasm/Cargo.toml index c37d092be5..e0a51c654e 100644 --- a/contracts/examples/rewards-distribution/wasm/Cargo.toml +++ b/contracts/examples/rewards-distribution/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/seed-nft-minter/Cargo.toml b/contracts/examples/seed-nft-minter/Cargo.toml index de6068c57c..9eedf28061 100644 --- a/contracts/examples/seed-nft-minter/Cargo.toml +++ b/contracts/examples/seed-nft-minter/Cargo.toml @@ -9,13 +9,13 @@ publish = false path = "src/seed_nft_minter.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/seed-nft-minter/meta/Cargo.toml b/contracts/examples/seed-nft-minter/meta/Cargo.toml index db0b4cc3c4..839ec9e833 100644 --- a/contracts/examples/seed-nft-minter/meta/Cargo.toml +++ b/contracts/examples/seed-nft-minter/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = ["Claudiu-Marcel Bruda "] path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.toml b/contracts/examples/seed-nft-minter/wasm/Cargo.toml index 78cfa0619d..e8110675a1 100644 --- a/contracts/examples/seed-nft-minter/wasm/Cargo.toml +++ b/contracts/examples/seed-nft-minter/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/examples/token-release/Cargo.toml b/contracts/examples/token-release/Cargo.toml index 663a0360f2..c56fac2a99 100644 --- a/contracts/examples/token-release/Cargo.toml +++ b/contracts/examples/token-release/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/token_release.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/examples/token-release/meta/Cargo.toml b/contracts/examples/token-release/meta/Cargo.toml index c7be81bde0..bd49f3c8e8 100644 --- a/contracts/examples/token-release/meta/Cargo.toml +++ b/contracts/examples/token-release/meta/Cargo.toml @@ -10,7 +10,7 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/examples/token-release/wasm/Cargo.toml b/contracts/examples/token-release/wasm/Cargo.toml index 6324dc7dbe..d397c09e87 100644 --- a/contracts/examples/token-release/wasm/Cargo.toml +++ b/contracts/examples/token-release/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/abi-tester/Cargo.toml b/contracts/feature-tests/abi-tester/Cargo.toml index 9b03c48a6a..4b598ebebf 100644 --- a/contracts/feature-tests/abi-tester/Cargo.toml +++ b/contracts/feature-tests/abi-tester/Cargo.toml @@ -9,14 +9,14 @@ publish = false path = "src/abi_tester.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dev-dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/meta" diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json index 13858c05dc..04fb495ff4 100644 --- a/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json +++ b/contracts/feature-tests/abi-tester/abi_tester_expected_main.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.47.0" + "version": "0.47.1" } }, "docs": [ diff --git a/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json b/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json index bfe9673731..79ccd76043 100644 --- a/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json +++ b/contracts/feature-tests/abi-tester/abi_tester_expected_view.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.47.0" + "version": "0.47.1" } }, "docs": [ diff --git a/contracts/feature-tests/abi-tester/meta/Cargo.toml b/contracts/feature-tests/abi-tester/meta/Cargo.toml index d7826c732b..21c17e0ccd 100644 --- a/contracts/feature-tests/abi-tester/meta/Cargo.toml +++ b/contracts/feature-tests/abi-tester/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml index 38c2d45a31..1ad38af5f7 100644 --- a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml +++ b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.toml b/contracts/feature-tests/abi-tester/wasm/Cargo.toml index 1aef8509ab..9da2c8e8ac 100644 --- a/contracts/feature-tests/abi-tester/wasm/Cargo.toml +++ b/contracts/feature-tests/abi-tester/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/alloc-features/Cargo.toml b/contracts/feature-tests/alloc-features/Cargo.toml index 7a85a4e70e..553a8a3d60 100644 --- a/contracts/feature-tests/alloc-features/Cargo.toml +++ b/contracts/feature-tests/alloc-features/Cargo.toml @@ -9,12 +9,12 @@ publish = false path = "src/alloc_features_main.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/alloc-features/meta/Cargo.toml b/contracts/feature-tests/alloc-features/meta/Cargo.toml index 31c1d44164..0dd7aeabe4 100644 --- a/contracts/feature-tests/alloc-features/meta/Cargo.toml +++ b/contracts/feature-tests/alloc-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.toml b/contracts/feature-tests/alloc-features/wasm/Cargo.toml index cbcf443d1f..f7f487967e 100644 --- a/contracts/feature-tests/alloc-features/wasm/Cargo.toml +++ b/contracts/feature-tests/alloc-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/basic-features/Cargo.toml b/contracts/feature-tests/basic-features/Cargo.toml index acd3294d61..50118386e8 100644 --- a/contracts/feature-tests/basic-features/Cargo.toml +++ b/contracts/feature-tests/basic-features/Cargo.toml @@ -9,15 +9,15 @@ publish = false path = "src/basic_features_main.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/basic-features/interact/Cargo.toml b/contracts/feature-tests/basic-features/interact/Cargo.toml index 1a027e115b..39419a6215 100644 --- a/contracts/feature-tests/basic-features/interact/Cargo.toml +++ b/contracts/feature-tests/basic-features/interact/Cargo.toml @@ -18,5 +18,5 @@ toml = "0.8.6" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/snippets" diff --git a/contracts/feature-tests/basic-features/meta/Cargo.toml b/contracts/feature-tests/basic-features/meta/Cargo.toml index 9a6a664080..830fefe878 100644 --- a/contracts/feature-tests/basic-features/meta/Cargo.toml +++ b/contracts/feature-tests/basic-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml index 9e499ef665..f5e488a954 100644 --- a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml +++ b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.toml b/contracts/feature-tests/basic-features/wasm/Cargo.toml index c905436b3a..7b23ae0164 100644 --- a/contracts/feature-tests/basic-features/wasm/Cargo.toml +++ b/contracts/feature-tests/basic-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = true path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/big-float-features/Cargo.toml b/contracts/feature-tests/big-float-features/Cargo.toml index 2784f4c7cd..25d5647588 100644 --- a/contracts/feature-tests/big-float-features/Cargo.toml +++ b/contracts/feature-tests/big-float-features/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/big_float_main.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/big-float-features/meta/Cargo.toml b/contracts/feature-tests/big-float-features/meta/Cargo.toml index d8b5c8270d..2463ba91e7 100644 --- a/contracts/feature-tests/big-float-features/meta/Cargo.toml +++ b/contracts/feature-tests/big-float-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.toml b/contracts/feature-tests/big-float-features/wasm/Cargo.toml index 5db771f704..132193065d 100644 --- a/contracts/feature-tests/big-float-features/wasm/Cargo.toml +++ b/contracts/feature-tests/big-float-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/Cargo.toml b/contracts/feature-tests/composability/Cargo.toml index 8a59f78c52..247a731013 100644 --- a/contracts/feature-tests/composability/Cargo.toml +++ b/contracts/feature-tests/composability/Cargo.toml @@ -33,9 +33,9 @@ path = "recursive-caller" path = "vault" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/composability/builtin-func-features/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/Cargo.toml index 75cf1475bb..e60d45cf7e 100644 --- a/contracts/feature-tests/composability/builtin-func-features/Cargo.toml +++ b/contracts/feature-tests/composability/builtin-func-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/builtin_func_features.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml index 9f20f38309..ca6783ebcc 100644 --- a/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml +++ b/contracts/feature-tests/composability/builtin-func-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml index 7377e0af32..eb2034f615 100644 --- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml index ceec5be22b..1c928ad193 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/Cargo.toml @@ -12,9 +12,9 @@ path = "first-contract" path = "second-contract" [dev-dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml index 5dd2f23340..d272e93172 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/Cargo.toml @@ -10,10 +10,10 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml index 33070bdec3..0cab01a143 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml index a99b67ded0..fa0534c66c 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml index 0bdfe25eef..84eba95f83 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/Cargo.toml @@ -10,10 +10,10 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml index e895aa03f7..c94908d049 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml index dffcdf11c0..3e703b3e8c 100644 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml index 213e692fbb..c47fe60462 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/Cargo.toml @@ -16,9 +16,9 @@ path = "parent" path = "child" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml index 3b4e868d7f..6512cc5bba 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/Cargo.toml @@ -10,9 +10,9 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml index c341bbdcb5..9277421608 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml index 8c4b255a6a..cfbb8605e8 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml index 4b0223694b..663aa5ec06 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/Cargo.toml @@ -13,10 +13,10 @@ path = "src/lib.rs" path = "../child" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml index e91998ae65..e60933dfd7 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/meta/Cargo.toml @@ -8,10 +8,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml index a7c0825e53..2a5a61c375 100644 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml index a4f4bbc83d..3277930049 100644 --- a/contracts/feature-tests/composability/forwarder-queue/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/Cargo.toml @@ -12,14 +12,14 @@ path = "src/forwarder_queue.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" optional = true [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml index 792c88faa5..9f836462e0 100644 --- a/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml index b46eae3c68..4bf40d8ddd 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml index e25c4b2460..14fbea5818 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-raw/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/Cargo.toml index cb20939361..26d9678659 100644 --- a/contracts/feature-tests/composability/forwarder-raw/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/forwarder_raw.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml index fde53aec53..b0b907da41 100644 --- a/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml index d338ba532e..a7f13613f0 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml index 9153ea36b4..8d90109e08 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml index ff7ec99f09..e9592d82a9 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/forwarder/Cargo.toml b/contracts/feature-tests/composability/forwarder/Cargo.toml index abbfbd6d26..eb886f44da 100644 --- a/contracts/feature-tests/composability/forwarder/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder/Cargo.toml @@ -12,10 +12,10 @@ path = "src/forwarder_main.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml index 44339a2997..dfa66eef23 100644 --- a/contracts/feature-tests/composability/forwarder/meta/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml index 1b6e7e7119..785bcf53e6 100644 --- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/interact/Cargo.toml b/contracts/feature-tests/composability/interact/Cargo.toml index 370b6cc1b4..649fa1a7b1 100644 --- a/contracts/feature-tests/composability/interact/Cargo.toml +++ b/contracts/feature-tests/composability/interact/Cargo.toml @@ -24,9 +24,9 @@ path = "../forwarder-queue" path = "../promises-features" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../../contracts/modules" [dependencies.multiversx-sc-snippets] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/snippets" diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml b/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml index 9a6a9f7473..0d9c2d7917 100644 --- a/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml +++ b/contracts/feature-tests/composability/local-esdt-and-nft/Cargo.toml @@ -10,9 +10,9 @@ path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml b/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml index 7f52fb6358..0a41e43c31 100644 --- a/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml +++ b/contracts/feature-tests/composability/local-esdt-and-nft/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml index 9aae033317..478b0493b8 100644 --- a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/promises-features/Cargo.toml b/contracts/feature-tests/composability/promises-features/Cargo.toml index 867abd1750..623e214e1d 100644 --- a/contracts/feature-tests/composability/promises-features/Cargo.toml +++ b/contracts/feature-tests/composability/promises-features/Cargo.toml @@ -12,6 +12,6 @@ path = "src/promises_main.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" diff --git a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml index 343794a00a..f26fc33605 100644 --- a/contracts/feature-tests/composability/promises-features/meta/Cargo.toml +++ b/contracts/feature-tests/composability/promises-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml index fc7e593733..69ae8675dd 100644 --- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/proxy-test-first/Cargo.toml b/contracts/feature-tests/composability/proxy-test-first/Cargo.toml index 7b8fd76918..2dfcbb3224 100644 --- a/contracts/feature-tests/composability/proxy-test-first/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-first/Cargo.toml @@ -12,10 +12,10 @@ path = "src/proxy-test-first.rs" hex-literal = "0.4.1" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml b/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml index 274394d687..c868baef5b 100644 --- a/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-first/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml index a9a7ad84ce..0611cf2acf 100644 --- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/proxy-test-second/Cargo.toml b/contracts/feature-tests/composability/proxy-test-second/Cargo.toml index bf61f04022..f8740e8aa2 100644 --- a/contracts/feature-tests/composability/proxy-test-second/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-second/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/proxy-test-second.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml b/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml index 66676912d3..89ca1b9c7f 100644 --- a/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-second/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml index 56e14c7410..98d327d1e3 100644 --- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/recursive-caller/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/Cargo.toml index 2ea32650d2..b3c88f3b17 100644 --- a/contracts/feature-tests/composability/recursive-caller/Cargo.toml +++ b/contracts/feature-tests/composability/recursive-caller/Cargo.toml @@ -12,9 +12,9 @@ path = "src/recursive_caller.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml index bc9e42dc28..2995fc704e 100644 --- a/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml +++ b/contracts/feature-tests/composability/recursive-caller/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml index a4be5189c8..0d2bff26e5 100644 --- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/transfer-role-features/Cargo.toml b/contracts/feature-tests/composability/transfer-role-features/Cargo.toml index 2b404aa0a5..e8908cf9db 100644 --- a/contracts/feature-tests/composability/transfer-role-features/Cargo.toml +++ b/contracts/feature-tests/composability/transfer-role-features/Cargo.toml @@ -12,13 +12,13 @@ path = "src/lib.rs" path = "../vault" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../../contracts/modules" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml b/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml index b8a94db281..defa1e0461 100644 --- a/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml +++ b/contracts/feature-tests/composability/transfer-role-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml index d57e641cc7..c283927675 100644 --- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/vault/Cargo.toml b/contracts/feature-tests/composability/vault/Cargo.toml index da188ccd47..f9a8eeb0bc 100644 --- a/contracts/feature-tests/composability/vault/Cargo.toml +++ b/contracts/feature-tests/composability/vault/Cargo.toml @@ -10,9 +10,9 @@ path = "src/vault.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/composability/vault/meta/Cargo.toml b/contracts/feature-tests/composability/vault/meta/Cargo.toml index e8f48fd86d..29198ee0e3 100644 --- a/contracts/feature-tests/composability/vault/meta/Cargo.toml +++ b/contracts/feature-tests/composability/vault/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml index 08ac314271..8b860b4ed7 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml +++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml index bd976326aa..37e13b92e3 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml +++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.toml b/contracts/feature-tests/composability/vault/wasm/Cargo.toml index 47b845080d..781829beaa 100644 --- a/contracts/feature-tests/composability/vault/wasm/Cargo.toml +++ b/contracts/feature-tests/composability/vault/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml index 19071e3967..86329a1554 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/Cargo.toml @@ -12,10 +12,10 @@ path = "src/crowdfunding_erc20.rs" path = "../erc20" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml index 0aaf458003..befcc30fb5 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml index 9a9c00e504..07b13875a2 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml index 692371b35e..81dca0438e 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/Cargo.toml @@ -13,10 +13,10 @@ path = "src/lib.rs" path = "../erc1155" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml index dcae9300f7..1cdd916052 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml index af7b0cd311..e17d1648eb 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml index d5f4663246..ba70c6acae 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml index 790f179367..5c6b8d9d48 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml index 1319bd0c22..0ed8cb2802 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml index ff93dc2fb1..61708001f7 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155/Cargo.toml @@ -9,12 +9,12 @@ publish = false path = "src/erc1155.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" [dev-dependencies.erc1155-user-mock] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml index ba798a8305..d8ed97e86c 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml index 76418e2323..b742ba9432 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml index e046ef567e..4050fe2714 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc20/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/erc20.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml index a482dafccc..622f882afd 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc20/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml index 586f58294e..7f2c7fe992 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml index de29cf7588..18fee9e1fc 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc721/Cargo.toml @@ -10,9 +10,9 @@ path = "src/erc721.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml index 7f86fdae8f..106683f95c 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc721/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml index 0212e69314..0d0440343d 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml b/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml index f92705702a..ef27c4759c 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/Cargo.toml @@ -12,10 +12,10 @@ path = "src/lottery.rs" path = "../erc20" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" features = ["alloc"] [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/scenario" diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml b/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml index b54fa568e3..8d24426dc5 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml index 726b8a0a46..3b2c3c247f 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml b/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml index 5c5a2af3f3..8c6b82c751 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml +++ b/contracts/feature-tests/esdt-system-sc-mock/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/esdt_system_sc_mock.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml b/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml index fc23828baf..e2e3d9cb63 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml +++ b/contracts/feature-tests/esdt-system-sc-mock/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml index b91e28c3d7..e8d4caae68 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml +++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/formatted-message-features/Cargo.toml b/contracts/feature-tests/formatted-message-features/Cargo.toml index d4c1ab53ef..f1ed4c9e6f 100644 --- a/contracts/feature-tests/formatted-message-features/Cargo.toml +++ b/contracts/feature-tests/formatted-message-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/formatted_message_features.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml index c97fe77652..d864e830e0 100644 --- a/contracts/feature-tests/formatted-message-features/meta/Cargo.toml +++ b/contracts/feature-tests/formatted-message-features/meta/Cargo.toml @@ -11,6 +11,6 @@ authors = [ "you",] path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml index 6edb9540d5..c1822c5857 100644 --- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml +++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/managed-map-features/Cargo.toml b/contracts/feature-tests/managed-map-features/Cargo.toml index 726f990e6f..9b626a3395 100644 --- a/contracts/feature-tests/managed-map-features/Cargo.toml +++ b/contracts/feature-tests/managed-map-features/Cargo.toml @@ -9,11 +9,11 @@ publish = false path = "src/mmap_features.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dev-dependencies.esdt-system-sc-mock] diff --git a/contracts/feature-tests/managed-map-features/meta/Cargo.toml b/contracts/feature-tests/managed-map-features/meta/Cargo.toml index 896a5e8c79..8bbd8e7c03 100644 --- a/contracts/feature-tests/managed-map-features/meta/Cargo.toml +++ b/contracts/feature-tests/managed-map-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml index 50bf2be373..1080429913 100644 --- a/contracts/feature-tests/managed-map-features/wasm/Cargo.toml +++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/Cargo.toml b/contracts/feature-tests/multi-contract-features/Cargo.toml index 6e3afb7fd1..0b799047e7 100644 --- a/contracts/feature-tests/multi-contract-features/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/Cargo.toml @@ -12,9 +12,9 @@ path = "src/multi_contract_features.rs" example_feature = [] [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml index 9b6aca7705..49fbb992cd 100644 --- a/contracts/feature-tests/multi-contract-features/meta/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml index be306652ce..66a0d67b3c 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml index 33209da20f..80a4f0bd1e 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.toml @@ -26,7 +26,7 @@ path = ".." features = ["example_feature"] [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml index c4452626b0..de98ea2f36 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml index 7c4c2be135..a8a301d155 100644 --- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml +++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/panic-message-features/Cargo.toml b/contracts/feature-tests/panic-message-features/Cargo.toml index 0c62dd3f30..710fcbd478 100644 --- a/contracts/feature-tests/panic-message-features/Cargo.toml +++ b/contracts/feature-tests/panic-message-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/panic_features.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/panic-message-features/meta/Cargo.toml b/contracts/feature-tests/panic-message-features/meta/Cargo.toml index bcac9ba497..18f7d5ef79 100644 --- a/contracts/feature-tests/panic-message-features/meta/Cargo.toml +++ b/contracts/feature-tests/panic-message-features/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml index 3188cd5773..e5bdbaf3ff 100644 --- a/contracts/feature-tests/panic-message-features/wasm/Cargo.toml +++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/payable-features/Cargo.toml b/contracts/feature-tests/payable-features/Cargo.toml index 08baa8f279..2f83a8dd84 100644 --- a/contracts/feature-tests/payable-features/Cargo.toml +++ b/contracts/feature-tests/payable-features/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/payable_features.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/payable-features/meta/Cargo.toml b/contracts/feature-tests/payable-features/meta/Cargo.toml index 83ba669e27..2f08a04930 100644 --- a/contracts/feature-tests/payable-features/meta/Cargo.toml +++ b/contracts/feature-tests/payable-features/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.toml b/contracts/feature-tests/payable-features/wasm/Cargo.toml index f213a728ed..2a6fbe6674 100644 --- a/contracts/feature-tests/payable-features/wasm/Cargo.toml +++ b/contracts/feature-tests/payable-features/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml index 3a7dbc81f1..22b1dece33 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/Cargo.toml @@ -9,9 +9,9 @@ publish = false path = "src/lib.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" diff --git a/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml index ea65c31713..372254ba06 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/interact-rs/Cargo.toml @@ -13,7 +13,7 @@ path = "src/interactor_main.rs" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/snippets" # [workspace] diff --git a/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml index c466b7552e..c27fcc1c43 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs b/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs index 03418afdeb..320864a567 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs +++ b/contracts/feature-tests/rust-snippets-generator-test/src/lib.rs @@ -13,7 +13,7 @@ multiversx_sc::derive_imports!(); // Additionally, we also have to update the interact-rs snippets manually to add relative paths: // [dependencies.multiversx-sc-snippets] -// version = "0.47.0" +// version = "0.47.1" // path = "../../../../framework/snippets" #[derive( diff --git a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml index 679ade64ef..f82667bd4e 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml +++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml b/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml index 9f5747d26f..e5e7bee8bf 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml +++ b/contracts/feature-tests/rust-testing-framework-tester/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" publish = false [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" features = [ "alloc" ] @@ -17,7 +17,7 @@ path = "../../examples/adder" path = "../../feature-tests/basic-features" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dev-dependencies] diff --git a/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml b/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml index f9ed31af22..8b1bc5d08c 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml +++ b/contracts/feature-tests/rust-testing-framework-tester/meta/Cargo.toml @@ -8,6 +8,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml index 25a42d6ea0..270fad79b3 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml +++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/use-module/Cargo.toml b/contracts/feature-tests/use-module/Cargo.toml index 12c06726db..fc781a8530 100644 --- a/contracts/feature-tests/use-module/Cargo.toml +++ b/contracts/feature-tests/use-module/Cargo.toml @@ -9,17 +9,17 @@ publish = false path = "src/use_module.rs" [dependencies.multiversx-sc-modules] -version = "0.47.0" +version = "0.47.1" path = "../../../contracts/modules" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dev-dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dev-dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/meta" diff --git a/contracts/feature-tests/use-module/meta/Cargo.toml b/contracts/feature-tests/use-module/meta/Cargo.toml index f760081819..5126421875 100644 --- a/contracts/feature-tests/use-module/meta/Cargo.toml +++ b/contracts/feature-tests/use-module/meta/Cargo.toml @@ -9,6 +9,6 @@ publish = false path = ".." [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/use-module/meta/abi/Cargo.toml b/contracts/feature-tests/use-module/meta/abi/Cargo.toml index 89fe03aab1..eaf0d5f5a9 100644 --- a/contracts/feature-tests/use-module/meta/abi/Cargo.toml +++ b/contracts/feature-tests/use-module/meta/abi/Cargo.toml @@ -9,10 +9,10 @@ publish = false path = ".." [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/base" [dependencies.multiversx-sc-meta] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/meta" default-features = false diff --git a/contracts/feature-tests/use-module/use_module_expected_main.abi.json b/contracts/feature-tests/use-module/use_module_expected_main.abi.json index fe4219cff6..ed1d7ecf3f 100644 --- a/contracts/feature-tests/use-module/use_module_expected_main.abi.json +++ b/contracts/feature-tests/use-module/use_module_expected_main.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.47.0" + "version": "0.47.1" } }, "docs": [ diff --git a/contracts/feature-tests/use-module/use_module_expected_view.abi.json b/contracts/feature-tests/use-module/use_module_expected_view.abi.json index c8fed72a7d..0e48138077 100644 --- a/contracts/feature-tests/use-module/use_module_expected_view.abi.json +++ b/contracts/feature-tests/use-module/use_module_expected_view.abi.json @@ -14,7 +14,7 @@ }, "framework": { "name": "multiversx-sc", - "version": "0.47.0" + "version": "0.47.1" } }, "docs": [ diff --git a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml index 5d7c234288..cb56270dcd 100644 --- a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml +++ b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/feature-tests/use-module/wasm/Cargo.toml b/contracts/feature-tests/use-module/wasm/Cargo.toml index c749779a71..211d09316f 100644 --- a/contracts/feature-tests/use-module/wasm/Cargo.toml +++ b/contracts/feature-tests/use-module/wasm/Cargo.toml @@ -25,7 +25,7 @@ overflow-checks = false path = ".." [dependencies.multiversx-sc-wasm-adapter] -version = "0.47.0" +version = "0.47.1" path = "../../../../framework/wasm-adapter" [workspace] diff --git a/contracts/modules/Cargo.toml b/contracts/modules/Cargo.toml index d1561fb3b2..a9633722f7 100644 --- a/contracts/modules/Cargo.toml +++ b/contracts/modules/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" edition = "2021" authors = ["MultiversX "] @@ -17,5 +17,5 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies"] alloc = ["multiversx-sc/alloc"] [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../framework/base" diff --git a/data/codec-derive/Cargo.toml b/data/codec-derive/Cargo.toml index 90fee8999f..a6fd9279a0 100644 --- a/data/codec-derive/Cargo.toml +++ b/data/codec-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" edition = "2021" authors = ["dorin.iancu ", "Andrei Marinica ", "MultiversX "] diff --git a/data/codec/Cargo.toml b/data/codec/Cargo.toml index 7d44573d9f..74480be9c0 100644 --- a/data/codec/Cargo.toml +++ b/data/codec/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" edition = "2021" authors = ["Andrei Marinica ", "MultiversX "] @@ -19,7 +19,7 @@ alloc = [] [dependencies.multiversx-sc-codec-derive] path = "../codec-derive" -version = "=0.18.4" +version = "=0.18.5" optional = true [dependencies] @@ -28,4 +28,4 @@ num-bigint = { version = "=0.4.4", optional = true } # can only be used in std c [dev-dependencies.multiversx-sc-codec-derive] path = "../codec-derive" -version = "=0.18.4" +version = "=0.18.5" diff --git a/framework/base/Cargo.toml b/framework/base/Cargo.toml index f2d0f4b532..d5698c326d 100644 --- a/framework/base/Cargo.toml +++ b/framework/base/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" edition = "2021" authors = ["Andrei Marinica ", "MultiversX "] @@ -27,10 +27,10 @@ bitflags = "=2.4.2" num-traits = { version = "=0.2.17", default-features = false } [dependencies.multiversx-sc-derive] -version = "=0.47.0" +version = "=0.47.1" path = "../derive" [dependencies.multiversx-sc-codec] -version = "=0.18.4" +version = "=0.18.5" path = "../../data/codec" features = ["derive"] diff --git a/framework/derive/Cargo.toml b/framework/derive/Cargo.toml index c91d9bcfa4..4c22676fc0 100644 --- a/framework/derive/Cargo.toml +++ b/framework/derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" edition = "2021" authors = ["Andrei Marinica ", "MultiversX "] diff --git a/framework/meta/Cargo.toml b/framework/meta/Cargo.toml index c6774071fe..4746c5e5a8 100644 --- a/framework/meta/Cargo.toml +++ b/framework/meta/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-meta" -version = "0.47.0" +version = "0.47.1" edition = "2021" authors = [ @@ -52,7 +52,7 @@ pathdiff = { version = "0.2.1", optional = true } common-path = { version = "1.0.0", optional = true } [dependencies.multiversx-sc] -version = "=0.47.0" +version = "=0.47.1" path = "../base" features = ["alloc", "num-bigint"] diff --git a/framework/meta/src/cmd/contract/generate_snippets/snippet_crate_gen.rs b/framework/meta/src/cmd/contract/generate_snippets/snippet_crate_gen.rs index 50bc79fd6b..852072ab2b 100644 --- a/framework/meta/src/cmd/contract/generate_snippets/snippet_crate_gen.rs +++ b/framework/meta/src/cmd/contract/generate_snippets/snippet_crate_gen.rs @@ -69,7 +69,7 @@ path = "src/{SNIPPETS_SOURCE_FILE_NAME}" path = ".." [dependencies.multiversx-sc-snippets] -version = "0.47.0" +version = "0.47.1" # [workspace] diff --git a/framework/meta/src/cmd/contract/meta_config.rs b/framework/meta/src/cmd/contract/meta_config.rs index a3d18a175c..07b7d3735b 100644 --- a/framework/meta/src/cmd/contract/meta_config.rs +++ b/framework/meta/src/cmd/contract/meta_config.rs @@ -205,7 +205,7 @@ overflow-checks = false path = \"..\" [dependencies.multiversx-sc-wasm-adapter] -version = \"0.47.0\" +version = \"0.47.1\" path = \"../../../../framework/wasm-adapter\" [workspace] @@ -218,7 +218,7 @@ members = [\".\"] name: "test".to_string(), edition: "2021".to_string(), profile: ContractVariantProfile::default(), - framework_version: "0.47.0".to_string(), + framework_version: "0.47.1".to_string(), framework_path: Option::Some("../../../framework/base".to_string()), contract_features: Vec::::new(), }; diff --git a/framework/meta/src/version_history.rs b/framework/meta/src/version_history.rs index 1304d1af9f..30e72ec7da 100644 --- a/framework/meta/src/version_history.rs +++ b/framework/meta/src/version_history.rs @@ -3,7 +3,7 @@ use crate::{framework_version, framework_versions, version::FrameworkVersion}; /// The last version to be used for upgrades and templates. /// /// Should be edited every time a new version of the framework is released. -pub const LAST_VERSION: FrameworkVersion = framework_version!(0.47.0); +pub const LAST_VERSION: FrameworkVersion = framework_version!(0.47.1); /// Indicates where to stop with the upgrades. pub const LAST_UPGRADE_VERSION: FrameworkVersion = LAST_VERSION; @@ -58,6 +58,7 @@ pub const VERSIONS: &[FrameworkVersion] = framework_versions![ 0.46.0, 0.46.1, 0.47.0, + 0.47.1, ]; #[rustfmt::skip] @@ -79,7 +80,7 @@ pub const CHECK_AFTER_UPGRADE_TO: &[FrameworkVersion] = framework_versions![ 0.44.0, 0.45.2, 0.46.0, - 0.47.0, + 0.47.1, ]; pub const LOWER_VERSION_WITH_TEMPLATE_TAG: FrameworkVersion = framework_version!(0.43.0); diff --git a/framework/scenario/Cargo.toml b/framework/scenario/Cargo.toml index d0d2394d6e..a9fbeec30b 100644 --- a/framework/scenario/Cargo.toml +++ b/framework/scenario/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-scenario" -version = "0.47.0" +version = "0.47.1" edition = "2021" authors = [ @@ -40,23 +40,23 @@ path = "src/main.rs" run-go-tests = [] [dependencies.multiversx-sc] -version = "=0.47.0" +version = "=0.47.1" features = ["alloc", "num-bigint"] path = "../base" [dependencies.multiversx-sc-meta] -version = "=0.47.0" +version = "=0.47.1" path = "../meta" [dependencies.multiversx-chain-scenario-format] -version = "0.22.0" +version = "0.22.1" path = "../../sdk/scenario-format" [dependencies.multiversx-chain-vm-executor] version = "0.2.0" [dependencies.multiversx-chain-vm] -version = "=0.8.0" +version = "=0.8.1" path = "../../vm" [dependencies.multiversx-sdk] diff --git a/framework/snippets/Cargo.toml b/framework/snippets/Cargo.toml index b21536a82d..b2863f67fb 100644 --- a/framework/snippets/Cargo.toml +++ b/framework/snippets/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-snippets" -version = "0.47.0" +version = "0.47.1" edition = "2021" authors = ["MultiversX "] @@ -22,7 +22,7 @@ env_logger = "0.11" futures = "0.3" [dependencies.multiversx-sc-scenario] -version = "=0.47.0" +version = "=0.47.1" path = "../scenario" [dependencies.multiversx-sdk] diff --git a/framework/wasm-adapter/Cargo.toml b/framework/wasm-adapter/Cargo.toml index e68a7482e2..d471cdd226 100644 --- a/framework/wasm-adapter/Cargo.toml +++ b/framework/wasm-adapter/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" edition = "2021" authors = [ @@ -22,5 +22,5 @@ categories = [ ] [dependencies.multiversx-sc] -version = "=0.47.0" +version = "=0.47.1" path = "../base" diff --git a/sdk/scenario-format/Cargo.toml b/sdk/scenario-format/Cargo.toml index 6a8ae6d8aa..8bfef0f49e 100644 --- a/sdk/scenario-format/Cargo.toml +++ b/sdk/scenario-format/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-chain-scenario-format" -version = "0.22.0" +version = "0.22.1" edition = "2021" authors = ["Andrei Marinica ", "MultiversX "] diff --git a/tools/mxpy-snippet-generator/Cargo.toml b/tools/mxpy-snippet-generator/Cargo.toml index 56625509e5..baf2719afe 100644 --- a/tools/mxpy-snippet-generator/Cargo.toml +++ b/tools/mxpy-snippet-generator/Cargo.toml @@ -10,7 +10,7 @@ name = "mxpy-snippet-generator" path = "src/mxpy_snippet_generator.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../framework/base" [dependencies] diff --git a/tools/rust-debugger/format-tests/Cargo.toml b/tools/rust-debugger/format-tests/Cargo.toml index 4b43764c5d..20a0be3e12 100644 --- a/tools/rust-debugger/format-tests/Cargo.toml +++ b/tools/rust-debugger/format-tests/Cargo.toml @@ -9,15 +9,15 @@ name = "format-tests" path = "src/format_tests.rs" [dependencies.multiversx-sc] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/base" [dependencies.multiversx-sc-scenario] -version = "0.47.0" +version = "0.47.1" path = "../../../framework/scenario" [dependencies.multiversx-chain-vm] -version = "0.8.0" +version = "0.8.1" path = "../../../vm" [dev-dependencies] diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 23673a8591..6b2b6ec3ba 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "multiversx-chain-vm" -version = "0.8.0" +version = "0.8.1" edition = "2021" authors = [ From 34b7bf2b8581d62e9328dc63b57c54ca679b9b06 Mon Sep 17 00:00:00 2001 From: Andrei Marinica Date: Mon, 29 Jan 2024 14:21:01 +0200 Subject: [PATCH 84/84] update Cargo.lock --- .../benchmarks/large-storage/wasm/Cargo.lock | 18 +++++++-------- .../linked-list-repeat/wasm/Cargo.lock | 18 +++++++-------- .../mappers/map-repeat/wasm/Cargo.lock | 18 +++++++-------- .../mappers/queue-repeat/wasm/Cargo.lock | 18 +++++++-------- .../mappers/set-repeat/wasm/Cargo.lock | 18 +++++++-------- .../single-value-repeat/wasm/Cargo.lock | 18 +++++++-------- .../mappers/vec-repeat/wasm/Cargo.lock | 18 +++++++-------- .../benchmarks/send-tx-repeat/wasm/Cargo.lock | 18 +++++++-------- .../benchmarks/str-repeat/wasm/Cargo.lock | 18 +++++++-------- .../core/price-aggregator/wasm/Cargo.lock | 22 +++++++++---------- contracts/examples/adder/wasm/Cargo.lock | 18 +++++++-------- .../bonding-curve-contract/wasm/Cargo.lock | 20 ++++++++--------- .../examples/check-pause/wasm/Cargo.lock | 20 ++++++++--------- .../crowdfunding-esdt/wasm/Cargo.lock | 18 +++++++-------- .../examples/crypto-bubbles/wasm/Cargo.lock | 18 +++++++-------- .../kitty-auction/wasm/Cargo.lock | 18 +++++++-------- .../kitty-genetic-alg/wasm/Cargo.lock | 18 +++++++-------- .../kitty-ownership/wasm/Cargo.lock | 18 +++++++-------- .../examples/crypto-zombies/wasm/Cargo.lock | 18 +++++++-------- .../examples/digital-cash/wasm/Cargo.lock | 18 +++++++-------- contracts/examples/empty/wasm/Cargo.lock | 18 +++++++-------- .../esdt-transfer-with-fee/wasm/Cargo.lock | 18 +++++++-------- contracts/examples/factorial/wasm/Cargo.lock | 18 +++++++-------- .../examples/fractional-nfts/wasm/Cargo.lock | 20 ++++++++--------- .../examples/lottery-esdt/wasm/Cargo.lock | 18 +++++++-------- .../multisig/wasm-multisig-full/Cargo.lock | 20 ++++++++--------- .../multisig/wasm-multisig-view/Cargo.lock | 20 ++++++++--------- contracts/examples/multisig/wasm/Cargo.lock | 20 ++++++++--------- contracts/examples/nft-minter/wasm/Cargo.lock | 18 +++++++-------- .../nft-storage-prepay/wasm/Cargo.lock | 18 +++++++-------- .../examples/nft-subscription/wasm/Cargo.lock | 20 ++++++++--------- .../order-book/factory/wasm/Cargo.lock | 18 +++++++-------- .../examples/order-book/pair/wasm/Cargo.lock | 18 +++++++-------- .../examples/ping-pong-egld/wasm/Cargo.lock | 18 +++++++-------- .../examples/proxy-pause/wasm/Cargo.lock | 18 +++++++-------- .../rewards-distribution/wasm/Cargo.lock | 20 ++++++++--------- .../examples/seed-nft-minter/wasm/Cargo.lock | 20 ++++++++--------- .../examples/token-release/wasm/Cargo.lock | 18 +++++++-------- .../abi-tester/wasm-abi-tester-ev/Cargo.lock | 18 +++++++-------- .../feature-tests/abi-tester/wasm/Cargo.lock | 18 +++++++-------- .../alloc-features/wasm/Cargo.lock | 18 +++++++-------- .../Cargo.lock | 20 ++++++++--------- .../basic-features/wasm/Cargo.lock | 20 ++++++++--------- .../big-float-features/wasm/Cargo.lock | 18 +++++++-------- .../builtin-func-features/wasm/Cargo.lock | 18 +++++++-------- .../first-contract/wasm/Cargo.lock | 18 +++++++-------- .../second-contract/wasm/Cargo.lock | 18 +++++++-------- .../child/wasm/Cargo.lock | 18 +++++++-------- .../parent/wasm/Cargo.lock | 18 +++++++-------- .../wasm-forwarder-queue-promises/Cargo.lock | 18 +++++++-------- .../forwarder-queue/wasm/Cargo.lock | 18 +++++++-------- .../Cargo.lock | 18 +++++++-------- .../Cargo.lock | 18 +++++++-------- .../forwarder-raw/wasm/Cargo.lock | 18 +++++++-------- .../composability/forwarder/wasm/Cargo.lock | 18 +++++++-------- .../local-esdt-and-nft/wasm/Cargo.lock | 18 +++++++-------- .../promises-features/wasm/Cargo.lock | 18 +++++++-------- .../proxy-test-first/wasm/Cargo.lock | 18 +++++++-------- .../proxy-test-second/wasm/Cargo.lock | 18 +++++++-------- .../recursive-caller/wasm/Cargo.lock | 18 +++++++-------- .../transfer-role-features/wasm/Cargo.lock | 20 ++++++++--------- .../vault/wasm-vault-promises/Cargo.lock | 18 +++++++-------- .../vault/wasm-vault-upgrade/Cargo.lock | 18 +++++++-------- .../composability/vault/wasm/Cargo.lock | 18 +++++++-------- .../crowdfunding-erc20/wasm/Cargo.lock | 18 +++++++-------- .../erc1155-marketplace/wasm/Cargo.lock | 18 +++++++-------- .../erc1155-user-mock/wasm/Cargo.lock | 18 +++++++-------- .../erc1155/wasm/Cargo.lock | 18 +++++++-------- .../erc-style-contracts/erc20/wasm/Cargo.lock | 18 +++++++-------- .../erc721/wasm/Cargo.lock | 18 +++++++-------- .../lottery-erc20/wasm/Cargo.lock | 18 +++++++-------- .../esdt-system-sc-mock/wasm/Cargo.lock | 18 +++++++-------- .../wasm/Cargo.lock | 18 +++++++-------- .../managed-map-features/wasm/Cargo.lock | 18 +++++++-------- .../wasm-multi-contract-alt-impl/Cargo.lock | 18 +++++++-------- .../Cargo.lock | 18 +++++++-------- .../Cargo.lock | 18 +++++++-------- .../multi-contract-features/wasm/Cargo.lock | 18 +++++++-------- .../panic-message-features/wasm/Cargo.lock | 18 +++++++-------- .../payable-features/wasm/Cargo.lock | 18 +++++++-------- .../wasm/Cargo.lock | 18 +++++++-------- .../wasm/Cargo.lock | 18 +++++++-------- .../wasm-use-module-view/Cargo.lock | 20 ++++++++--------- .../feature-tests/use-module/wasm/Cargo.lock | 20 ++++++++--------- 84 files changed, 772 insertions(+), 772 deletions(-) diff --git a/contracts/benchmarks/large-storage/wasm/Cargo.lock b/contracts/benchmarks/large-storage/wasm/Cargo.lock index 1f9ded1339..e602c0bbba 100755 --- a/contracts/benchmarks/large-storage/wasm/Cargo.lock +++ b/contracts/benchmarks/large-storage/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock index f272991390..fac205b7f5 100644 --- a/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/linked-list-repeat/wasm/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock index 57ea164e4f..10a38dcf4b 100644 --- a/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/map-repeat/wasm/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock index 7df7e7b4a2..58f5e19dd2 100644 --- a/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/queue-repeat/wasm/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock index 4e10e62820..e11a8ccda8 100644 --- a/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/set-repeat/wasm/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock index ccf01e08c7..b25811540f 100644 --- a/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/single-value-repeat/wasm/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock index 22154251aa..0510eca71f 100644 --- a/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/mappers/vec-repeat/wasm/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock index a62bf46fc5..c0616fd1e5 100755 --- a/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/send-tx-repeat/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/benchmarks/str-repeat/wasm/Cargo.lock b/contracts/benchmarks/str-repeat/wasm/Cargo.lock index 49804be19f..e0db118b39 100755 --- a/contracts/benchmarks/str-repeat/wasm/Cargo.lock +++ b/contracts/benchmarks/str-repeat/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/core/price-aggregator/wasm/Cargo.lock b/contracts/core/price-aggregator/wasm/Cargo.lock index df66cf546f..3e683fa768 100644 --- a/contracts/core/price-aggregator/wasm/Cargo.lock +++ b/contracts/core/price-aggregator/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bumpalo" @@ -86,7 +86,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "multiversx-price-aggregator-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "arrayvec", "getrandom", @@ -105,7 +105,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -116,7 +116,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -124,7 +124,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -134,7 +134,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -145,14 +145,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -189,9 +189,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/adder/wasm/Cargo.lock b/contracts/examples/adder/wasm/Cargo.lock index f8e6b98305..7676166ecf 100755 --- a/contracts/examples/adder/wasm/Cargo.lock +++ b/contracts/examples/adder/wasm/Cargo.lock @@ -31,9 +31,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock index d193d994a7..3f2a2c82b8 100644 --- a/contracts/examples/bonding-curve-contract/wasm/Cargo.lock +++ b/contracts/examples/bonding-curve-contract/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bonding-curve-contract" @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/check-pause/wasm/Cargo.lock b/contracts/examples/check-pause/wasm/Cargo.lock index 18d03e6e27..86f60e811b 100644 --- a/contracts/examples/check-pause/wasm/Cargo.lock +++ b/contracts/examples/check-pause/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "check-pause" @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock index b9be134103..1fe6ea1692 100644 --- a/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock +++ b/contracts/examples/crowdfunding-esdt/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "crowdfunding-esdt" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/crypto-bubbles/wasm/Cargo.lock b/contracts/examples/crypto-bubbles/wasm/Cargo.lock index d1cfb7c354..fd5f1dbb97 100755 --- a/contracts/examples/crypto-bubbles/wasm/Cargo.lock +++ b/contracts/examples/crypto-bubbles/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "crypto-bubbles" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock index 0f20799fa0..cfcd3e21b7 100755 --- a/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock +++ b/contracts/examples/crypto-kitties/kitty-auction/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -113,7 +113,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -124,7 +124,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -149,9 +149,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock index 8ef626cbdd..c9f90f6d4b 100755 --- a/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock +++ b/contracts/examples/crypto-kitties/kitty-genetic-alg/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -65,7 +65,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -94,7 +94,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -105,7 +105,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -130,9 +130,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock index 169130bd78..aa34daf004 100755 --- a/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock +++ b/contracts/examples/crypto-kitties/kitty-ownership/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -86,7 +86,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -94,7 +94,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -104,7 +104,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -115,7 +115,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/crypto-zombies/wasm/Cargo.lock b/contracts/examples/crypto-zombies/wasm/Cargo.lock index 259652ab24..3e0ae1457b 100755 --- a/contracts/examples/crypto-zombies/wasm/Cargo.lock +++ b/contracts/examples/crypto-zombies/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "crypto-zombies" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/digital-cash/wasm/Cargo.lock b/contracts/examples/digital-cash/wasm/Cargo.lock index 89de79bbfd..165a6838af 100644 --- a/contracts/examples/digital-cash/wasm/Cargo.lock +++ b/contracts/examples/digital-cash/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "digital-cash" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/empty/wasm/Cargo.lock b/contracts/examples/empty/wasm/Cargo.lock index cfbde325a2..1e4e713ec1 100755 --- a/contracts/examples/empty/wasm/Cargo.lock +++ b/contracts/examples/empty/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "empty" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock index dc33b3478b..892566c322 100644 --- a/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock +++ b/contracts/examples/esdt-transfer-with-fee/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/factorial/wasm/Cargo.lock b/contracts/examples/factorial/wasm/Cargo.lock index 87ee4229cd..db7055dc6d 100755 --- a/contracts/examples/factorial/wasm/Cargo.lock +++ b/contracts/examples/factorial/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/fractional-nfts/wasm/Cargo.lock b/contracts/examples/fractional-nfts/wasm/Cargo.lock index 2ab372c110..9c9ef6fa7a 100644 --- a/contracts/examples/fractional-nfts/wasm/Cargo.lock +++ b/contracts/examples/fractional-nfts/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/lottery-esdt/wasm/Cargo.lock b/contracts/examples/lottery-esdt/wasm/Cargo.lock index 0867bf1def..439ed4a52f 100755 --- a/contracts/examples/lottery-esdt/wasm/Cargo.lock +++ b/contracts/examples/lottery-esdt/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock index e4575c9aa6..55847eee03 100644 --- a/contracts/examples/multisig/wasm-multisig-full/Cargo.lock +++ b/contracts/examples/multisig/wasm-multisig-full/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock index bffd16a1c7..c5f60fbd42 100644 --- a/contracts/examples/multisig/wasm-multisig-view/Cargo.lock +++ b/contracts/examples/multisig/wasm-multisig-view/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/multisig/wasm/Cargo.lock b/contracts/examples/multisig/wasm/Cargo.lock index 27bfdcf074..f1ac79d9e3 100755 --- a/contracts/examples/multisig/wasm/Cargo.lock +++ b/contracts/examples/multisig/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -56,7 +56,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/nft-minter/wasm/Cargo.lock b/contracts/examples/nft-minter/wasm/Cargo.lock index a485fdcf54..7bb1201618 100644 --- a/contracts/examples/nft-minter/wasm/Cargo.lock +++ b/contracts/examples/nft-minter/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock index 4ebfca3be8..a50fed5343 100755 --- a/contracts/examples/nft-storage-prepay/wasm/Cargo.lock +++ b/contracts/examples/nft-storage-prepay/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/nft-subscription/wasm/Cargo.lock b/contracts/examples/nft-subscription/wasm/Cargo.lock index 7a35f030dd..3daf9d535d 100644 --- a/contracts/examples/nft-subscription/wasm/Cargo.lock +++ b/contracts/examples/nft-subscription/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/order-book/factory/wasm/Cargo.lock b/contracts/examples/order-book/factory/wasm/Cargo.lock index df4090dbe2..1be32d48ba 100644 --- a/contracts/examples/order-book/factory/wasm/Cargo.lock +++ b/contracts/examples/order-book/factory/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/order-book/pair/wasm/Cargo.lock b/contracts/examples/order-book/pair/wasm/Cargo.lock index 0c088f75ce..45be0e29cc 100644 --- a/contracts/examples/order-book/pair/wasm/Cargo.lock +++ b/contracts/examples/order-book/pair/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/ping-pong-egld/wasm/Cargo.lock b/contracts/examples/ping-pong-egld/wasm/Cargo.lock index 64c10d348f..94d8f84e33 100755 --- a/contracts/examples/ping-pong-egld/wasm/Cargo.lock +++ b/contracts/examples/ping-pong-egld/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/proxy-pause/wasm/Cargo.lock b/contracts/examples/proxy-pause/wasm/Cargo.lock index 691bdee69f..626b0cfa44 100644 --- a/contracts/examples/proxy-pause/wasm/Cargo.lock +++ b/contracts/examples/proxy-pause/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/rewards-distribution/wasm/Cargo.lock b/contracts/examples/rewards-distribution/wasm/Cargo.lock index 1f262ab120..8266a18374 100644 --- a/contracts/examples/rewards-distribution/wasm/Cargo.lock +++ b/contracts/examples/rewards-distribution/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/seed-nft-minter/wasm/Cargo.lock b/contracts/examples/seed-nft-minter/wasm/Cargo.lock index ed9f8bcb6e..6f42d76fae 100644 --- a/contracts/examples/seed-nft-minter/wasm/Cargo.lock +++ b/contracts/examples/seed-nft-minter/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/examples/token-release/wasm/Cargo.lock b/contracts/examples/token-release/wasm/Cargo.lock index 45a7fe0c7d..12df3cc3cd 100644 --- a/contracts/examples/token-release/wasm/Cargo.lock +++ b/contracts/examples/token-release/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock index 157e1d628b..d819003e67 100644 --- a/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock +++ b/contracts/feature-tests/abi-tester/wasm-abi-tester-ev/Cargo.lock @@ -31,9 +31,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/abi-tester/wasm/Cargo.lock b/contracts/feature-tests/abi-tester/wasm/Cargo.lock index 9b37097880..0dc322e54e 100755 --- a/contracts/feature-tests/abi-tester/wasm/Cargo.lock +++ b/contracts/feature-tests/abi-tester/wasm/Cargo.lock @@ -31,9 +31,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/alloc-features/wasm/Cargo.lock b/contracts/feature-tests/alloc-features/wasm/Cargo.lock index b1940a67b6..d6a29f27e2 100644 --- a/contracts/feature-tests/alloc-features/wasm/Cargo.lock +++ b/contracts/feature-tests/alloc-features/wasm/Cargo.lock @@ -31,9 +31,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock index 8562d60969..8630b3620a 100644 --- a/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock +++ b/contracts/feature-tests/basic-features/wasm-basic-features-storage-bytes/Cargo.lock @@ -32,9 +32,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/basic-features/wasm/Cargo.lock b/contracts/feature-tests/basic-features/wasm/Cargo.lock index 3c6d64fda6..e5f39c5dd5 100755 --- a/contracts/feature-tests/basic-features/wasm/Cargo.lock +++ b/contracts/feature-tests/basic-features/wasm/Cargo.lock @@ -32,9 +32,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,14 +96,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/big-float-features/wasm/Cargo.lock b/contracts/feature-tests/big-float-features/wasm/Cargo.lock index ee4076313b..74fe4ed6af 100644 --- a/contracts/feature-tests/big-float-features/wasm/Cargo.lock +++ b/contracts/feature-tests/big-float-features/wasm/Cargo.lock @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock index 22309738d6..09417708f1 100644 --- a/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/builtin-func-features/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "builtin-func-features" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock index c301ec9a7c..2206451e39 100755 --- a/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/esdt-contract-pair/first-contract/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock index c724f115c1..5ef0439068 100755 --- a/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/esdt-contract-pair/second-contract/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock index b421b43024..583778886d 100755 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/child/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "child" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock index dccd848f0b..8bc9376dda 100755 --- a/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/execute-on-dest-esdt-issue-callback/parent/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "child" @@ -47,7 +47,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -58,7 +58,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -76,7 +76,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -87,7 +87,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock index 4e1cf9ace6..8b7f676d60 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-queue/wasm-forwarder-queue-promises/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock index db6b64c978..33754112ee 100644 --- a/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-queue/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock index 081ea03191..4317077a2a 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-async-call/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock index 8128ca23c5..551409f823 100644 --- a/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-raw/wasm-forwarder-raw-init-sync-call/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock index 07f6274d93..1c07e82cb7 100755 --- a/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder-raw/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock index abdbc93e8b..36bf150762 100755 --- a/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/forwarder/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -56,7 +56,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -75,7 +75,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -85,7 +85,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -96,7 +96,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock index b5411e6713..9c4b61ac4c 100755 --- a/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/local-esdt-and-nft/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock index 5d974632e6..7ca754c57a 100644 --- a/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/promises-features/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock index 1034aff686..8f8ea2eab0 100755 --- a/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/proxy-test-first/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock index 83b129de5c..8cd5a962ce 100755 --- a/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/proxy-test-second/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock index 29deafbeb5..851a166443 100755 --- a/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/recursive-caller/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock index 594b1d2e4f..386e7b1a7d 100644 --- a/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/transfer-role-features/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock index e6b40108ee..6a116eb039 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock +++ b/contracts/feature-tests/composability/vault/wasm-vault-promises/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock index d3140e1fb4..386aecb456 100644 --- a/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock +++ b/contracts/feature-tests/composability/vault/wasm-vault-upgrade/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/composability/vault/wasm/Cargo.lock b/contracts/feature-tests/composability/vault/wasm/Cargo.lock index ac21ef7242..c9cf8e35a8 100755 --- a/contracts/feature-tests/composability/vault/wasm/Cargo.lock +++ b/contracts/feature-tests/composability/vault/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock index 350e6dc296..5f4e5c6a13 100644 --- a/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/crowdfunding-erc20/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "crowdfunding-erc20" @@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock index 627786eade..ae4c7c7721 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc1155-marketplace/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -63,7 +63,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock index 290a059106..2423e95623 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc1155-user-mock/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock index a239efa4a8..d820b817a2 100644 --- a/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc1155/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock index 6c6a111ebc..9439d10b90 100644 --- a/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc20/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock index dec0765b7b..f00729126f 100644 --- a/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/erc721/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock index 4bdccf483b..2828c2d4ad 100644 --- a/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock +++ b/contracts/feature-tests/erc-style-contracts/lottery-erc20/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -63,7 +63,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -82,7 +82,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -92,7 +92,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -103,7 +103,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -128,9 +128,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock index 5b6e587bab..dce1f23a00 100644 --- a/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock +++ b/contracts/feature-tests/esdt-system-sc-mock/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock index 6f838c6a2b..261249a735 100644 --- a/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock +++ b/contracts/feature-tests/formatted-message-features/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock index e709b62491..c9c8b04f01 100644 --- a/contracts/feature-tests/managed-map-features/wasm/Cargo.lock +++ b/contracts/feature-tests/managed-map-features/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock index 17705079a6..aaa30e9c0b 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-alt-impl/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock index 23dafe9611..474e3abf41 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-example-feature/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock index 0b4eba3ebe..3869ff2385 100644 --- a/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm-multi-contract-features-view/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock index c60601abda..255bf06db1 100755 --- a/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock +++ b/contracts/feature-tests/multi-contract-features/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -55,7 +55,7 @@ dependencies = [ [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -66,7 +66,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -74,7 +74,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -95,7 +95,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock index 9e07bdb2ec..ff0a4b03fb 100755 --- a/contracts/feature-tests/panic-message-features/wasm/Cargo.lock +++ b/contracts/feature-tests/panic-message-features/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/payable-features/wasm/Cargo.lock b/contracts/feature-tests/payable-features/wasm/Cargo.lock index 466bf65575..34d89e5270 100755 --- a/contracts/feature-tests/payable-features/wasm/Cargo.lock +++ b/contracts/feature-tests/payable-features/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -120,9 +120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock index 37e3619db7..0202737332 100644 --- a/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock +++ b/contracts/feature-tests/rust-snippets-generator-test/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock index f4db7e9768..e12d1ac376 100644 --- a/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock +++ b/contracts/feature-tests/rust-testing-framework-tester/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,7 +80,7 @@ dependencies = [ [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -105,9 +105,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock index dfdcf5ddbe..6268078b64 100644 --- a/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock +++ b/contracts/feature-tests/use-module/wasm-use-module-view/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] diff --git a/contracts/feature-tests/use-module/wasm/Cargo.lock b/contracts/feature-tests/use-module/wasm/Cargo.lock index b30f6011dd..0399a6fe2c 100644 --- a/contracts/feature-tests/use-module/wasm/Cargo.lock +++ b/contracts/feature-tests/use-module/wasm/Cargo.lock @@ -16,9 +16,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "endian-type" @@ -40,7 +40,7 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "multiversx-sc" -version = "0.47.0" +version = "0.47.1" dependencies = [ "bitflags", "hex-literal", @@ -51,7 +51,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec" -version = "0.18.4" +version = "0.18.5" dependencies = [ "arrayvec", "multiversx-sc-codec-derive", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "multiversx-sc-codec-derive" -version = "0.18.4" +version = "0.18.5" dependencies = [ "hex", "proc-macro2", @@ -69,7 +69,7 @@ dependencies = [ [[package]] name = "multiversx-sc-derive" -version = "0.47.0" +version = "0.47.1" dependencies = [ "hex", "proc-macro2", @@ -80,14 +80,14 @@ dependencies = [ [[package]] name = "multiversx-sc-modules" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] [[package]] name = "multiversx-sc-wasm-adapter" -version = "0.47.0" +version = "0.47.1" dependencies = [ "multiversx-sc", ] @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ]